[74910] trunk/dports/graphics/g2

[ryandesign at macports.org]

Revision: 74910
          http://trac.macports.org/changeset/74910
Author:   ryandesign at macports.org
Date:     2011-01-06 05:47:46 -0800 (Thu, 06 Jan 2011)
Log Message:
-----------
g2: also install shared library, using fixes from upstream and from me; see #27797

Modified Paths:
--------------
    trunk/dports/graphics/g2/Portfile
    trunk/dports/graphics/g2/files/patch-Makefile.in.diff
    trunk/dports/graphics/g2/files/patch-configure.in.diff

Modified: trunk/dports/graphics/g2/Portfile
===================================================================
--- trunk/dports/graphics/g2/Portfile	2011-01-06 11:52:23 UTC (rev 74909)
+++ trunk/dports/graphics/g2/Portfile	2011-01-06 13:47:46 UTC (rev 74910)
@@ -5,6 +5,7 @@
 
 name                    g2
 version                 0.72
+revision                1
 categories              graphics
 platforms               darwin
 maintainers             ryandesign
@@ -21,7 +22,6 @@
                         rmd160  946a2752a7cfe90c6594953c383d710b2b80561c
 
 depends_lib             port:gd2 \
-                        port:xfig \
                         port:xorg-libX11 \
                         port:xorg-libXext
 
@@ -32,6 +32,8 @@
 
 configure.universal_args-delete --disable-dependency-tracking
 
+build.target-append     shared
+
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdir}

Modified: trunk/dports/graphics/g2/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/graphics/g2/files/patch-Makefile.in.diff	2011-01-06 11:52:23 UTC (rev 74909)
+++ trunk/dports/graphics/g2/files/patch-Makefile.in.diff	2011-01-06 13:47:46 UTC (rev 74910)
@@ -1,8 +1,23 @@
 --- Makefile.in.orig	2006-10-17 13:38:16.000000000 -0500
-+++ Makefile.in	2011-01-06 03:14:44.000000000 -0600
-@@ -101,11 +101,11 @@
- 	ln -f -s libg2. at LD_SHARED_EXT@ $@
++++ Makefile.in	2011-01-06 07:32:03.000000000 -0600
+@@ -64,6 +64,7 @@
+ @DO_GD at GD_SRC = $(GD_DIR)/g2_gd.c
+ @DO_GD at GD_INS = $(GD_DIR)/g2_gd.h
  
++LIBS=@LIBS@
+ 
+ SRC = $(BASE_SRC) $(PS_SRC) $(FIG_SRC) $(X11_SRC) $(WIN32_SRC) $(GD_SRC)
+ OBJ = $(SRC:.c=.o)
+@@ -95,17 +96,15 @@
+ 	test ! -n "$(RANLIB)" || $(RANLIB) $@
+ 
+ libg2. at LD_SHARED_EXT@: $(OBJ)
+-	@LD_SHARED@ @LD_SHARED_FLAGS@ -o $@ $(OBJ) @LD_SHARED_OPT@
+-
+-libg2.so: libg2. at LD_SHARED_EXT@
+-	ln -f -s libg2. at LD_SHARED_EXT@ $@
++	@LD_SHARED@ @LD_SHARED_FLAGS@ -o $@ $(OBJ) $(LIBS) @LD_SHARED_OPT@
+ 
  install: libg2.a
 -	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
 -	test -d $(INCDIR) || mkdir -p $(INCDIR)
@@ -10,6 +25,7 @@
 +	test -d $(DESTDIR)$(LIBDIR) || mkdir -p $(DESTDIR)$(LIBDIR)
 +	test -d $(DESTDIR)$(INCDIR) || mkdir -p $(DESTDIR)$(INCDIR)
 +	$(INSTALL_DATA) libg2.a $(DESTDIR)$(LIBDIR)
++	test -f libg2. at LD_SHARED_EXT@ && $(INSTALL_DATA) libg2. at LD_SHARED_EXT@ $(DESTDIR)$(LIBDIR) && test "@LD_SHARED_EXT@" != "@LD_SHARED_EXT_SHORT@" && ln -f -s libg2. at LD_SHARED_EXT@ $(DESTDIR)$(LIBDIR)/libg2. at LD_SHARED_EXT_SHORT@
  	for IFILE in $(INS); do \
 -		$(INSTALL_DATA) $$IFILE  $(INCDIR); \
 +		$(INSTALL_DATA) $$IFILE $(DESTDIR)$(INCDIR); \

Modified: trunk/dports/graphics/g2/files/patch-configure.in.diff
===================================================================
--- trunk/dports/graphics/g2/files/patch-configure.in.diff	2011-01-06 11:52:23 UTC (rev 74909)
+++ trunk/dports/graphics/g2/files/patch-configure.in.diff	2011-01-06 13:47:46 UTC (rev 74910)
@@ -1,6 +1,47 @@
 --- configure.in.orig	2006-10-16 16:36:59.000000000 -0500
-+++ configure.in	2011-01-06 02:48:39.000000000 -0600
-@@ -59,8 +65,8 @@
++++ configure.in	2011-01-06 07:23:02.000000000 -0600
+@@ -18,21 +18,32 @@
+ 		LD_SHARED_FLAGS='-shared -soname libg2.so.0'
+ 		LD_SHARED_OPT=''
+ 		LD_SHARED_EXT='so.0.$(G2_VERSION)'
++		LD_SHARED_EXT_SHORT='so'
+ 		AC_DEFINE(LINUX);;
++ *-darwin*)
++		LD_SHARED='$(CC)'
++		LD_SHARED_FLAGS='-dynamiclib -install_name $(LIBDIR)/libg2.dylib'
++		LD_SHARED_OPT='$(LDFLAGS) -lc'
++		LD_SHARED_EXT='0.$(G2_VERSION).dylib'
++		LD_SHARED_EXT_SHORT='dylib'
++		AC_DEFINE(DARWIN);;
+     *-aix*)
+ 		LD_SHARED='ld'
+ 		LD_SHARED_FLAGS='-bM:SRE -bnoentry -bexpall'
+ 		LD_SHARED_OPT='$(LDFLAGS) -lc'
+ 		LD_SHARED_EXT='so'
++		LD_SHARED_EXT_SHORT='so'
+ 		AC_DEFINE(AIX);;
+     *-osf*)
+ 		LD_SHARED='ld'
+ 		LD_SHARED_FLAGS='-shared'
+ 		LD_SHARED_OPT='$(LDFLAGS) -lc'
+ 		LD_SHARED_EXT='so'
++		LD_SHARED_EXT_SHORT='so'
+ 		AC_DEFINE(OSF);;
+          *)
+ 		LD_SHARED_EXT='so'
++		LD_SHARED_EXT_SHORT='so'
+ 		AC_DEFINE(UNIX);;
+ esac
+ 
+@@ -40,6 +51,7 @@
+ AC_SUBST(LD_SHARED_FLAGS)
+ AC_SUBST(LD_SHARED_OPT)
+ AC_SUBST(LD_SHARED_EXT)
++AC_SUBST(LD_SHARED_EXT_SHORT)
+ 
+ #
+ # check C compiler, preprocesor, etc.
+@@ -59,8 +71,8 @@
  # and add /usr/local to include and lib path and add -lm (for testing)
  #
  AC_PATH_XTRA
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110106/8786960f/attachment.html>