[75754] trunk/dports/games/gnubg

[jmr at macports.org]

Revision: 75754
          http://trac.macports.org/changeset/75754
Author:   jmr at macports.org
Date:     2011-02-07 04:33:24 -0800 (Mon, 07 Feb 2011)
Log Message:
-----------
gnubg: fix build when PNG_iTXt_SUPPORTED is true (#28310) and when libevent is installed

Modified Paths:
--------------
    trunk/dports/games/gnubg/Portfile

Added Paths:
-----------
    trunk/dports/games/gnubg/files/patch-Makefile.in.diff
    trunk/dports/games/gnubg/files/patch-export.c.diff

Modified: trunk/dports/games/gnubg/Portfile
===================================================================
--- trunk/dports/games/gnubg/Portfile	2011-02-07 11:03:22 UTC (rev 75753)
+++ trunk/dports/games/gnubg/Portfile	2011-02-07 12:33:24 UTC (rev 75754)
@@ -26,7 +26,7 @@
 checksums               ${name}-${version}.tar.gz md5 b3ab1ace76fa4bea69db8e617ab587da \
                         ${name}.weights-0.14.gz md5 9f1154a9b327954a260726aa6aa6eea5
 
-depends_build           path:bin/pkg-config:pkgconfig
+depends_build           port:pkgconfig
 depends_lib             port:gtk2 \
                         port:libxml2 \
                         port:freetype \
@@ -37,10 +37,11 @@
                         move ${worksrcpath}/${name}.weights-0.14 ${worksrcpath}/${name}.weights
                         }
 
-patchfiles              patch-configure.diff patch-rollout.h.diff
+patchfiles              patch-configure.diff patch-rollout.h.diff \
+                        patch-export.c.diff patch-Makefile.in.diff
 
-configure.cflags-append "-lmx"
-configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
+configure.cflags-append -lmx
+configure.ldflags -lX11 -bind_at_load -multiply_defined suppress
 
 configure.args          --mandir=${prefix}/share/man \
                         --infodir=${prefix}/share/info \

Added: trunk/dports/games/gnubg/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/games/gnubg/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/games/gnubg/files/patch-Makefile.in.diff	2011-02-07 12:33:24 UTC (rev 75754)
@@ -0,0 +1,47 @@
+--- Makefile.in.orig	2004-05-07 16:20:25.000000000 +1000
++++ Makefile.in	2011-02-07 23:28:54.000000000 +1100
+@@ -225,7 +225,7 @@
+               @FT2_CFLAGS@ @GTKEXTRA_CFLAGS@ @PYTHON_CFLAGS@ \
+               @GLIB_CFLAGS@
+ 
+-COMMON_LIBS = @LIBOBJS@ -Llib -levent @GUILE_LIBS@ @INTLLIBS@ @LIBXML2_LIBS@ \
++COMMON_LIBS = @LIBOBJS@ lib/libevent.a @GUILE_LIBS@ @INTLLIBS@ @LIBXML2_LIBS@ \
+               @FT2_LIBS@ @GTKEXTRA_LIBS@ @PYTHON_LIBS@ @GLIB_LIBS@
+ 
+ COMMON_SOURCES = backgammon.h gnubg.c getopt.h getopt.c getopt1.c eval.h \
+@@ -293,7 +293,7 @@
+         bearoffgammon.c bearoffgammon.h bearoff.c bearoff.h path.c path.h \
+ 	format.c format.h mec.h mec.c $(LIBGEN_SOURCES)  $(BR1_SOURCES)
+ 
+-makebearoff_LDADD = -Llib -levent $(COMMON_LIBS) @GTK_LIBS@
++makebearoff_LDADD = lib/libevent.a $(COMMON_LIBS) @GTK_LIBS@
+ makebearoff_DEPENDENCIES = lib/libevent.a
+ 
+ makebearoff1_SOURCES = makebearoff1.c getopt.c getopt.h getopt1.c \
+@@ -303,7 +303,7 @@
+ makebearoff1_DEPENDENCIES = 
+ 
+ makeweights_SOURCES = makeweights.c i18n.c i18n.h $(LIBGEN_SOURCES)
+-makeweights_LDADD = -Llib -levent $(COMMON_LIBS) @GTK_LIBS@
++makeweights_LDADD = lib/libevent.a $(COMMON_LIBS) @GTK_LIBS@
+ makeweights_DEPENDENCIES = lib/libevent.a
+ 
+ makehyper_SOURCES = makehyper.c eval.h eval.c positionid.h positionid.c \
+@@ -314,7 +314,7 @@
+ 	$(LIBGEN_SOURCES) $(BR1_SOURCES)
+ 
+ 
+-makehyper_LDADD = -Llib -levent $(COMMON_LIBS) @GTK_LIBS@
++makehyper_LDADD = lib/libevent.a $(COMMON_LIBS) @GTK_LIBS@
+ makehyper_DEPENDENCIES = lib/libevent.a
+ 
+ bearoffdump_SOURCES = bearoffdump.c eval.h eval.c positionid.h positionid.c \
+@@ -323,7 +323,7 @@
+         bearoffgammon.c bearoffgammon.h bearoff.c bearoff.h path.c path.h \
+ 	format.c format.h mec.h mec.c $(LIBGEN_SOURCES)  $(BR1_SOURCES)
+ 
+-bearoffdump_LDADD = -Llib -levent $(COMMON_LIBS) @GTK_LIBS@
++bearoffdump_LDADD = lib/libevent.a $(COMMON_LIBS) @GTK_LIBS@
+ bearoffdump_DEPENDENCIES = lib/libevent.a
+ 
+ erftest_SOURCES = erftest.c

Added: trunk/dports/games/gnubg/files/patch-export.c.diff
===================================================================
--- trunk/dports/games/gnubg/files/patch-export.c.diff	                        (rev 0)
+++ trunk/dports/games/gnubg/files/patch-export.c.diff	2011-02-07 12:33:24 UTC (rev 75754)
@@ -0,0 +1,13 @@
+--- export.c.orig	2004-04-02 19:40:40.000000000 +1000
++++ export.c	2011-02-07 22:53:47.000000000 +1100
+@@ -123,8 +123,8 @@ WritePNG (const char *sz, unsigned char 
+   atext[1].compression = PNG_TEXT_COMPRESSION_NONE;
+ 
+ #ifdef PNG_iTXt_SUPPORTED
+-  text_ptr[0].lang = NULL;
+-  text_ptr[1].lang = NULL;
++  atext[0].lang = NULL;
++  atext[1].lang = NULL;
+ #endif
+   png_set_text (ppng, pinfo, atext, 2);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110207/292d89ed/attachment.html>