[csw-devel] SF.net SVN: gar:[7959] csw/mgar/pkg/libgsf/trunk

[hson at users.sourceforge.net]

Revision: 7959
          http://gar.svn.sourceforge.net/gar/?rev=7959&view=rev
Author:   hson
Date:     2010-01-10 23:28:12 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
libgsf: Some minor cleanup

Modified Paths:
--------------
    csw/mgar/pkg/libgsf/trunk/Makefile
    csw/mgar/pkg/libgsf/trunk/checksums

Modified: csw/mgar/pkg/libgsf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgsf/trunk/Makefile	2010-01-10 23:26:05 UTC (rev 7958)
+++ csw/mgar/pkg/libgsf/trunk/Makefile	2010-01-10 23:28:12 UTC (rev 7959)
@@ -18,9 +18,10 @@
 REQUIRED_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2
 REQUIRED_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib CSWiconv
 
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs
+
 CONFIGURE_ARGS = $(DIRPATHS)
 #CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS)
 #CONFIGURE_ARGS += --enable-gtk-doc=no
@@ -28,26 +29,24 @@
 
 TEST_TARGET = check
 
-EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs
+# Missing 64-bit libs:
+# libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so
+#BUILD64 = 1
 
+STRIP_LIBTOOL = 1
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)
 
-post-configure-$(MODULATION):
-	@(echo "~~~ Fixing Libtool ~~~")
-	@$(FILEDIR)/fixme.sh $(WORKSRC)
-#	@$(FILEDIR)/fixme2.sh $(WORKSRC)
-	$(DONADA)
-
 post-install-isa-sparcv8:
 	@cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1
 	@cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1
-	@ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
-	@ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi )
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi )
 
 post-install-isa-i386:
 	@cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1
 	@cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1
-	@ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
-	@ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi )
+	@( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi )

Modified: csw/mgar/pkg/libgsf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgsf/trunk/checksums	2010-01-10 23:26:05 UTC (rev 7958)
+++ csw/mgar/pkg/libgsf/trunk/checksums	2010-01-10 23:28:12 UTC (rev 7959)
@@ -1,2 +1 @@
-7d6fa1c26ebb58dcf2128c3b9c7d1a2a  download/libgsf-1.14.11.tar.gz
-34f5b20f6caf282b2533784fbb1b4395  download/fixme.sh
+7d6fa1c26ebb58dcf2128c3b9c7d1a2a  libgsf-1.14.11.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.