[77072] trunk/dports/devel/modglue
gwright at macports.org
gwright at macports.org
Sat Mar 19 07:12:49 PDT 2011
Revision: 77072
http://trac.macports.org/changeset/77072
Author: gwright at macports.org
Date: 2011-03-19 07:12:45 -0700 (Sat, 19 Mar 2011)
Log Message:
-----------
Disable parallel build, reorganize Makefile.in
patch and add a patch to eliminate a warning message.
Modified Paths:
--------------
trunk/dports/devel/modglue/Portfile
Added Paths:
-----------
trunk/dports/devel/modglue/files/patch-src-Makefile.in.diff
trunk/dports/devel/modglue/files/patch-src-main.cc.diff
Removed Paths:
-------------
trunk/dports/devel/modglue/files/patch-Makefile.in.diff
Modified: trunk/dports/devel/modglue/Portfile
===================================================================
--- trunk/dports/devel/modglue/Portfile 2011-03-19 13:32:21 UTC (rev 77071)
+++ trunk/dports/devel/modglue/Portfile 2011-03-19 14:12:45 UTC (rev 77072)
@@ -3,7 +3,7 @@
PortSystem 1.0
name modglue
-version 1.13
+version 1.16
categories devel
platforms darwin
maintainers gwright
@@ -16,11 +16,13 @@
homepage http://www.aei.mpg.de/~peekas/cadabra/
master_sites ${homepage}
-checksums md5 8723d0332e51832c0e2e803b365d0fbf \
- sha1 a9c839653fb5e654360104bdc9d9f20afb4ae78b \
- rmd160 f493e49d6d80bb9dbc418db6b079958708a01c69
+checksums md5 2299c40f3bba37b23d5e21498eec9c66 \
+ sha1 3f47c261c81fdd0ff4ba2dc7958dd4d83dcffd1b \
+ rmd160 46e0ee58004dfbdcc34862d73ec85d699b2dece0
depends_lib port:libsigcxx2
+use_parallel_build no
-patchfiles patch-Makefile.in.diff
+patchfiles patch-src-Makefile.in.diff \
+ patch-src-main.cc.diff
Deleted: trunk/dports/devel/modglue/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/modglue/files/patch-Makefile.in.diff 2011-03-19 13:32:21 UTC (rev 77071)
+++ trunk/dports/devel/modglue/files/patch-Makefile.in.diff 2011-03-19 14:12:45 UTC (rev 77072)
@@ -1,28 +0,0 @@
---- src/Makefile.in.sav 2009-07-30 09:26:07.000000000 -0400
-+++ src/Makefile.in 2009-07-30 09:26:42.000000000 -0400
-@@ -99,20 +99,18 @@
- install: library tools
- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@
- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/lib
-- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/lib
- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin
-- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue
-+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/include/modglue
- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/lib
-- mv ${DESTDIR}@prefix@/lib/libmodglue*.so ${DEVDESTDIR}@prefix@/lib
- # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib
- ${FPHASE}
- ${IPHASE} ptywrap ${DESTDIR}@prefix@/bin
- ${IPHASE} prompt ${DESTDIR}@prefix@/bin
- # ${IPHASE} isatty ${DESTDIR}@prefix@/bin
-- @INSTALL@ -m 0644 ../include/modglue/ext_process.hh ${DEVDESTDIR}@prefix@/include/modglue
-- @INSTALL@ -m 0644 ../include/modglue/process.hh ${DEVDESTDIR}@prefix@/include/modglue
-- @INSTALL@ -m 0644 ../include/modglue/pipe.hh ${DEVDESTDIR}@prefix@/include/modglue
-- @INSTALL@ -m 0644 ../include/modglue/main.hh ${DEVDESTDIR}@prefix@/include/modglue
-+ @INSTALL@ -m 0644 ../include/modglue/ext_process.hh ${DESTDIR}@prefix@/include/modglue
-+ @INSTALL@ -m 0644 ../include/modglue/process.hh ${DESTDIR}@prefix@/include/modglue
-+ @INSTALL@ -m 0644 ../include/modglue/pipe.hh ${DESTDIR}@prefix@/include/modglue
-+ @INSTALL@ -m 0644 ../include/modglue/main.hh ${DESTDIR}@prefix@/include/modglue
-
- clean:
- rm -f *.o *.lo *~ libmodglue* libmid*
Added: trunk/dports/devel/modglue/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/devel/modglue/files/patch-src-Makefile.in.diff (rev 0)
+++ trunk/dports/devel/modglue/files/patch-src-Makefile.in.diff 2011-03-19 14:12:45 UTC (rev 77072)
@@ -0,0 +1,31 @@
+--- src/Makefile.in.sav 2011-03-18 13:30:02.000000000 -0400
++++ src/Makefile.in 2011-03-18 13:30:44.000000000 -0400
+@@ -99,22 +99,19 @@
+ install: library tools
+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@
+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@
+- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@
++ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@
+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin
+- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue
++ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/include/modglue
+ ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@
+-ifneq ($(DESTDIR),$(DEVDESTDIR))
+- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@
+-endif
+ # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib
+ ${FPHASE}
+ ${IPHASE} ptywrap ${DESTDIR}@prefix@/bin
+ ${IPHASE} prompt ${DESTDIR}@prefix@/bin
+ # ${IPHASE} isatty ${DESTDIR}@prefix@/bin
+- @INSTALL@ -m 0644 ../include/modglue/ext_process.hh ${DEVDESTDIR}@prefix@/include/modglue
+- @INSTALL@ -m 0644 ../include/modglue/process.hh ${DEVDESTDIR}@prefix@/include/modglue
+- @INSTALL@ -m 0644 ../include/modglue/pipe.hh ${DEVDESTDIR}@prefix@/include/modglue
+- @INSTALL@ -m 0644 ../include/modglue/main.hh ${DEVDESTDIR}@prefix@/include/modglue
++ @INSTALL@ -m 0644 ../include/modglue/ext_process.hh ${DESTDIR}@prefix@/include/modglue
++ @INSTALL@ -m 0644 ../include/modglue/process.hh ${DESTDIR}@prefix@/include/modglue
++ @INSTALL@ -m 0644 ../include/modglue/pipe.hh ${DESTDIR}@prefix@/include/modglue
++ @INSTALL@ -m 0644 ../include/modglue/main.hh ${DESTDIR}@prefix@/include/modglue
+
+ clean:
+ rm -f *.o *.lo *~ libmodglue* libmid*
Added: trunk/dports/devel/modglue/files/patch-src-main.cc.diff
===================================================================
--- trunk/dports/devel/modglue/files/patch-src-main.cc.diff (rev 0)
+++ trunk/dports/devel/modglue/files/patch-src-main.cc.diff 2011-03-19 14:12:45 UTC (rev 77072)
@@ -0,0 +1,11 @@
+--- src/main.cc.sav 2011-03-18 13:41:44.000000000 -0400
++++ src/main.cc 2011-03-18 13:42:32.000000000 -0400
+@@ -293,7 +293,7 @@
+ pid_t childpid=0;
+ int exit_code=0;
+ // std::cerr << buffer << std::endl;
+- sscanf(buffer, "%ld %d", &childpid, &exit_code);
++ sscanf(buffer, "%ld %d", (long *)&childpid, &exit_code);
+ // This often gets reached after cerr has gone away. Why?
+ for(unsigned int i=0; i<processes_.size(); ++i) {
+ // std::cerr << processes_[i]->get_pid() << std::endl;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110319/f7a3b748/attachment.html>
More information about the macports-changes
mailing list