[31242] trunk/dports
boeyms at macports.org
boeyms at macports.org
Sun Nov 18 16:42:48 PST 2007
Revision: 31242
http://trac.macosforge.org/projects/macports/changeset/31242
Author: boeyms at macports.org
Date: 2007-11-18 16:42:41 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Fix my ports to conform with the new patch naming scheme.
Modified Paths:
--------------
trunk/dports/aqua/Growl/Portfile
trunk/dports/devel/cook/Portfile
trunk/dports/devel/gpgme/Portfile
trunk/dports/mail/gnupg2/Portfile
trunk/dports/mail/libsieve/Portfile
trunk/dports/multimedia/libmms/Portfile
trunk/dports/multimedia/mimms/Portfile
trunk/dports/net/dsocks/Portfile
trunk/dports/net/maradns/Portfile
trunk/dports/net/packetforward/Portfile
trunk/dports/security/gpg-agent/Portfile
trunk/dports/sysutils/getopt/Portfile
trunk/dports/textproc/fop-0.20/Portfile
trunk/dports/www/nginx/Portfile
trunk/dports/x11/mrxvt/Portfile
Added Paths:
-----------
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff
trunk/dports/aqua/Growl/files/patch-Makefile.diff
trunk/dports/devel/cook/files/patch-common__help.c.diff
trunk/dports/devel/cook/files/patch-common__ts.c.diff
trunk/dports/devel/gpgme/files/patch-assuan_assuan.h.diff
trunk/dports/devel/gpgme/files/patch-assuan_funopen.c.diff
trunk/dports/mail/gnupg2/files/patch-configure.diff
trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c.diff
trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c.diff
trunk/dports/multimedia/libmms/files/patch-src__uri.c.diff
trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac.diff
trunk/dports/multimedia/mimms/files/patch-Makefile.qt4.diff
trunk/dports/multimedia/mimms/files/patch-mimms.cpp.diff
trunk/dports/multimedia/mimms/files/patch-mimms.pro.diff
trunk/dports/net/dsocks/files/patch-dsocks-torify.sh.diff
trunk/dports/net/dsocks/files/patch-dsocks.h.diff
trunk/dports/net/dsocks/files/patch-dsocks.sh.diff
trunk/dports/net/maradns/files/patch-build__Makefile.darwin.diff
trunk/dports/net/maradns/files/patch-configure.diff
trunk/dports/net/maradns/files/patch-install.darwin.diff
trunk/dports/net/packetforward/files/patch-Makefile.diff
trunk/dports/security/gpg-agent/files/patch-configure.diff
trunk/dports/security/gpg-agent/files/patch-po_Makevars.diff
trunk/dports/sysutils/getopt/files/patch-Makefile.diff
trunk/dports/textproc/fop-0.20/files/patch-fop.sh.diff
trunk/dports/textproc/fop-0.20/files/patch-xalan.sh.diff
trunk/dports/www/nginx/files/patch-auto__install.diff
trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff
trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff
Removed Paths:
-------------
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc
trunk/dports/aqua/Growl/files/patch-Makefile
trunk/dports/devel/cook/files/patch-common__help.c
trunk/dports/devel/cook/files/patch-common__ts.c
trunk/dports/devel/gpgme/files/patch-assuan_assuan.h
trunk/dports/devel/gpgme/files/patch-assuan_funopen.c
trunk/dports/mail/gnupg2/files/patch-configure
trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c
trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c
trunk/dports/multimedia/libmms/files/patch-src__uri.c
trunk/dports/multimedia/mimms/files/patch-Makefile.qt4
trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac
trunk/dports/multimedia/mimms/files/patch-mimms.cpp
trunk/dports/multimedia/mimms/files/patch-mimms.pro
trunk/dports/net/dsocks/files/patch-dsocks-torify.sh
trunk/dports/net/dsocks/files/patch-dsocks.h
trunk/dports/net/dsocks/files/patch-dsocks.sh
trunk/dports/net/maradns/files/patch-build__Makefile.darwin
trunk/dports/net/maradns/files/patch-configure
trunk/dports/net/maradns/files/patch-install.darwin
trunk/dports/net/packetforward/files/patch-Makefile
trunk/dports/security/gpg-agent/files/patch-configure
trunk/dports/security/gpg-agent/files/patch-po_Makevars
trunk/dports/sysutils/getopt/files/patch-Makefile
trunk/dports/textproc/fop-0.20/files/patch-fop.sh
trunk/dports/textproc/fop-0.20/files/patch-xalan.sh
trunk/dports/www/nginx/files/patch-auto__install
trunk/dports/www/nginx/files/patch-conf__nginx.conf
trunk/dports/x11/mrxvt/files/patch-src__rxvt.h
Modified: trunk/dports/aqua/Growl/Portfile
===================================================================
--- trunk/dports/aqua/Growl/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/aqua/Growl/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -36,7 +36,7 @@
# architecture, rather than as universal binaries as the distributed source is
# configured to do. This probably plays havoc with the MacPorts +universal
# variant, so I'll need to think further about this.
-patchfiles patch-Growl.xcodeproj__project.pbxproj.${os.arch}
+patchfiles patch-Growl.xcodeproj__project.pbxproj.${os.arch}.diff
use_configure no
build.target growl
destroot.destdir PREFIX=${destroot}
@@ -48,6 +48,6 @@
variant universal {
patchfiles-delete \
- patch-Growl.xcodeproj__project.pbxproj.${os.arch}
+ patch-Growl.xcodeproj__project.pbxproj.${os.arch}.diff
}
Deleted: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,10 +0,0 @@
---- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
-+++ Growl.xcodeproj/project.pbxproj.i386 2007-06-28 09:25:49.000000000 +0000
-@@ -3837,7 +3837,6 @@
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
-- ppc,
- i386,
- );
- DEAD_CODE_STRIPPING = YES;
Copied: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff (from rev 31107, trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386)
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff (rev 0)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,10 @@
+--- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
++++ Growl.xcodeproj/project.pbxproj.i386 2007-06-28 09:25:49.000000000 +0000
+@@ -3837,7 +3837,6 @@
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+- ppc,
+ i386,
+ );
+ DEAD_CODE_STRIPPING = YES;
Deleted: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,10 +0,0 @@
---- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
-+++ Growl.xcodeproj/project.pbxproj.powerpc 2007-06-28 09:22:55.000000000 +0000
-@@ -3838,7 +3838,6 @@
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- ppc,
-- i386,
- );
- DEAD_CODE_STRIPPING = YES;
- DEPLOYMENT_POSTPROCESSING = YES;
Copied: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff (from rev 31107, trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc)
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff (rev 0)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,10 @@
+--- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
++++ Growl.xcodeproj/project.pbxproj.powerpc 2007-06-28 09:22:55.000000000 +0000
+@@ -3838,7 +3838,6 @@
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ ppc,
+- i386,
+ );
+ DEAD_CODE_STRIPPING = YES;
+ DEPLOYMENT_POSTPROCESSING = YES;
Deleted: trunk/dports/aqua/Growl/files/patch-Makefile
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Makefile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/aqua/Growl/files/patch-Makefile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,18 +0,0 @@
---- Makefile.orig 2007-05-24 22:00:30.000000000 +0000
-+++ Makefile 2007-05-28 23:07:52.000000000 +0000
-@@ -40,13 +40,13 @@
- install:
- killall GrowlHelperApp || true
- -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE) $(FRAMEWORKS_DIR)/$(GROWL_FRAMEWORK)
-- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-+ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
- open $(GROWL_HELPER_APP)
-
- install-growl:
- killall GrowlHelperApp || true
- -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-+ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
- open $(GROWL_HELPER_APP)
-
- headerdoc:
Copied: trunk/dports/aqua/Growl/files/patch-Makefile.diff (from rev 31107, trunk/dports/aqua/Growl/files/patch-Makefile)
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/aqua/Growl/files/patch-Makefile.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,18 @@
+--- Makefile.orig 2007-05-24 22:00:30.000000000 +0000
++++ Makefile 2007-05-28 23:07:52.000000000 +0000
+@@ -40,13 +40,13 @@
+ install:
+ killall GrowlHelperApp || true
+ -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE) $(FRAMEWORKS_DIR)/$(GROWL_FRAMEWORK)
+- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
++ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
+ open $(GROWL_HELPER_APP)
+
+ install-growl:
+ killall GrowlHelperApp || true
+ -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
+- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
++ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
+ open $(GROWL_HELPER_APP)
+
+ headerdoc:
Modified: trunk/dports/devel/cook/Portfile
===================================================================
--- trunk/dports/devel/cook/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/cook/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -20,7 +20,7 @@
sha1 bdf0dd8e75a9279a3c4e02b554cf1c57e1cc88fa \
rmd160 1187944a17132fc9ee4ae3ee6a3db7fea938b5f5
depends_lib port:libiconv port:gettext
-patchfiles patch-common__help.c patch-common__ts.c
+patchfiles patch-common__help.c.diff patch-common__ts.c.diff
pre-configure {
reinplace "s|__PREFIX__|${prefix}|g" \
"${worksrcpath}/common/help.c"
Deleted: trunk/dports/devel/cook/files/patch-common__help.c
===================================================================
--- trunk/dports/devel/cook/files/patch-common__help.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/cook/files/patch-common__help.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- common/help.c 2007-03-18 21:58:15.000000000 +0000
-+++ common/help.c.new 2007-04-16 09:18:16.000000000 +0000
-@@ -68,7 +68,7 @@
- string_list_append(&manpath, s);
- str_free(s);
-
-- s = str_from_c("/usr/share/man");
-+ s = str_from_c("__PREFIX__/share/man");
- string_list_append(&manpath, s);
- str_free(s);
- }
Copied: trunk/dports/devel/cook/files/patch-common__help.c.diff (from rev 31107, trunk/dports/devel/cook/files/patch-common__help.c)
===================================================================
--- trunk/dports/devel/cook/files/patch-common__help.c.diff (rev 0)
+++ trunk/dports/devel/cook/files/patch-common__help.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- common/help.c 2007-03-18 21:58:15.000000000 +0000
++++ common/help.c.new 2007-04-16 09:18:16.000000000 +0000
+@@ -68,7 +68,7 @@
+ string_list_append(&manpath, s);
+ str_free(s);
+
+- s = str_from_c("/usr/share/man");
++ s = str_from_c("__PREFIX__/share/man");
+ string_list_append(&manpath, s);
+ str_free(s);
+ }
Deleted: trunk/dports/devel/cook/files/patch-common__ts.c
===================================================================
--- trunk/dports/devel/cook/files/patch-common__ts.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/cook/files/patch-common__ts.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- common/ts.c 2007-06-22 10:23:38.000000000 +0000
-+++ common/ts.c.new 2007-06-27 15:21:08.000000000 +0000
-@@ -20,6 +20,8 @@
- * MANIFEST: functions to query the filesystem's timestamp granularity.
- */
-
-+#include <sys/types.h>
-+
- #include <common/ac/stdlib.h>
-
- #include <cook/id.h>
Copied: trunk/dports/devel/cook/files/patch-common__ts.c.diff (from rev 31107, trunk/dports/devel/cook/files/patch-common__ts.c)
===================================================================
--- trunk/dports/devel/cook/files/patch-common__ts.c.diff (rev 0)
+++ trunk/dports/devel/cook/files/patch-common__ts.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- common/ts.c 2007-06-22 10:23:38.000000000 +0000
++++ common/ts.c.new 2007-06-27 15:21:08.000000000 +0000
+@@ -20,6 +20,8 @@
+ * MANIFEST: functions to query the filesystem's timestamp granularity.
+ */
+
++#include <sys/types.h>
++
+ #include <common/ac/stdlib.h>
+
+ #include <cook/id.h>
Modified: trunk/dports/devel/gpgme/Portfile
===================================================================
--- trunk/dports/devel/gpgme/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/gpgme/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -24,7 +24,7 @@
sha1 d3c71afb8b88b1050067633cd8bcc4ca0bae696d \
rmd160 c268df6edfe786871198323773bcc75d10f3c071
-patchfiles patch-assuan_assuan.h patch-assuan_funopen.c
+patchfiles patch-assuan_assuan.h.diff patch-assuan_funopen.c.diff
depends_lib port:gnupg port:pth port:libgpg-error
Deleted: trunk/dports/devel/gpgme/files/patch-assuan_assuan.h
===================================================================
--- trunk/dports/devel/gpgme/files/patch-assuan_assuan.h 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/gpgme/files/patch-assuan_assuan.h 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,10 +0,0 @@
---- assuan/assuan.h.orig 2005-10-01 14:14:48.000000000 -0600
-+++ assuan/assuan.h 2006-03-22 17:52:35.000000000 -0700
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/socket.h>
-
-
- /* To use this file with libraries the following macros are often
Copied: trunk/dports/devel/gpgme/files/patch-assuan_assuan.h.diff (from rev 31107, trunk/dports/devel/gpgme/files/patch-assuan_assuan.h)
===================================================================
--- trunk/dports/devel/gpgme/files/patch-assuan_assuan.h.diff (rev 0)
+++ trunk/dports/devel/gpgme/files/patch-assuan_assuan.h.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,10 @@
+--- assuan/assuan.h.orig 2005-10-01 14:14:48.000000000 -0600
++++ assuan/assuan.h 2006-03-22 17:52:35.000000000 -0700
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <sys/socket.h>
+
+
+ /* To use this file with libraries the following macros are often
Deleted: trunk/dports/devel/gpgme/files/patch-assuan_funopen.c
===================================================================
--- trunk/dports/devel/gpgme/files/patch-assuan_funopen.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/devel/gpgme/files/patch-assuan_funopen.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,18 +0,0 @@
---- assuan/funopen.c.orig 2005-09-08 08:42:30.000000000 -0600
-+++ assuan/funopen.c 2006-03-22 18:41:18.000000000 -0700
-@@ -22,6 +22,8 @@
- #include <config.h>
- #endif
-
-+#ifndef HAVE_FUNOPEN
-+
- #include <stdio.h>
-
-
-@@ -61,3 +63,6 @@
- #else
- #error No known way to implement funopen.
- #endif
-+
-+#endif
-+
Copied: trunk/dports/devel/gpgme/files/patch-assuan_funopen.c.diff (from rev 31107, trunk/dports/devel/gpgme/files/patch-assuan_funopen.c)
===================================================================
--- trunk/dports/devel/gpgme/files/patch-assuan_funopen.c.diff (rev 0)
+++ trunk/dports/devel/gpgme/files/patch-assuan_funopen.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,18 @@
+--- assuan/funopen.c.orig 2005-09-08 08:42:30.000000000 -0600
++++ assuan/funopen.c 2006-03-22 18:41:18.000000000 -0700
+@@ -22,6 +22,8 @@
+ #include <config.h>
+ #endif
+
++#ifndef HAVE_FUNOPEN
++
+ #include <stdio.h>
+
+
+@@ -61,3 +63,6 @@
+ #else
+ #error No known way to implement funopen.
+ #endif
++
++#endif
++
Modified: trunk/dports/mail/gnupg2/Portfile
===================================================================
--- trunk/dports/mail/gnupg2/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/mail/gnupg2/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -44,7 +44,7 @@
port:libgpg-error \
port:pth
-patchfiles patch-configure \
+patchfiles patch-configure.diff \
patch-g10_status.c.diff
test.run yes
Deleted: trunk/dports/mail/gnupg2/files/patch-configure
===================================================================
--- trunk/dports/mail/gnupg2/files/patch-configure 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/mail/gnupg2/files/patch-configure 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- configure 2007-01-31 14:09:31.000000000 +0000
-+++ configure.new 2007-02-16 14:06:34.000000000 +0000
-@@ -557,7 +557,7 @@
- SHELL=${CONFIG_SHELL-/bin/sh}
-
- # Identity of this package.
--PACKAGE_NAME='gnupg'
-+PACKAGE_NAME='gnupg2'
- PACKAGE_TARNAME='gnupg'
- PACKAGE_VERSION='2.0.7'
- PACKAGE_STRING='gnupg 2.0.7'
Copied: trunk/dports/mail/gnupg2/files/patch-configure.diff (from rev 31107, trunk/dports/mail/gnupg2/files/patch-configure)
===================================================================
--- trunk/dports/mail/gnupg2/files/patch-configure.diff (rev 0)
+++ trunk/dports/mail/gnupg2/files/patch-configure.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- configure 2007-01-31 14:09:31.000000000 +0000
++++ configure.new 2007-02-16 14:06:34.000000000 +0000
+@@ -557,7 +557,7 @@
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+ # Identity of this package.
+-PACKAGE_NAME='gnupg'
++PACKAGE_NAME='gnupg2'
+ PACKAGE_TARNAME='gnupg'
+ PACKAGE_VERSION='2.0.7'
+ PACKAGE_STRING='gnupg 2.0.7'
Modified: trunk/dports/mail/libsieve/Portfile
===================================================================
--- trunk/dports/mail/libsieve/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/mail/libsieve/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -20,7 +20,7 @@
# These patches have been incorporated upstream and should be able to be
# removed at the next version
-patchfiles patch-src__sv_parser__addr.c patch-src__sv_parser__sieve.c
+patchfiles patch-src__sv_parser__addr.c.diff patch-src__sv_parser__sieve.c.diff
checksums md5 f0adbfa59254d07611d907f78aaa20cd \
sha1 27816679f4d8ecbaf8a3504cc47aad7015e7719b \
Deleted: trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c
===================================================================
--- trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- src/sv_parser/addr.c 2006-11-26 02:48:03.000000000 +0000
-+++ src/sv_parser/addr.c.new 2007-04-04 14:02:49.000000000 +0000
-@@ -145,7 +145,7 @@
- /* There are global to this file */
- char *libsieve_addrptr; /* pointer to sieve string for address lexer */
- char *libsieve_addrerr; /* buffer for sieve parser error messages */
--struct sieve2_context *libsieve_parse_context;
-+extern struct sieve2_context *libsieve_parse_context;
- static struct address *addr = NULL;
- static struct mlbuf *ml = NULL;
-
Copied: trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c.diff (from rev 31107, trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c)
===================================================================
--- trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c.diff (rev 0)
+++ trunk/dports/mail/libsieve/files/patch-src__sv_parser__addr.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- src/sv_parser/addr.c 2006-11-26 02:48:03.000000000 +0000
++++ src/sv_parser/addr.c.new 2007-04-04 14:02:49.000000000 +0000
+@@ -145,7 +145,7 @@
+ /* There are global to this file */
+ char *libsieve_addrptr; /* pointer to sieve string for address lexer */
+ char *libsieve_addrerr; /* buffer for sieve parser error messages */
+-struct sieve2_context *libsieve_parse_context;
++extern struct sieve2_context *libsieve_parse_context;
+ static struct address *addr = NULL;
+ static struct mlbuf *ml = NULL;
+
Deleted: trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c
===================================================================
--- trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,13 +0,0 @@
---- src/sv_parser/sieve.c 2006-12-08 06:53:58.000000000 +0000
-+++ src/sv_parser/sieve.c.new 2007-04-04 14:02:17.000000000 +0000
-@@ -2819,8 +2819,8 @@
- return 1;
- }
-
--char *libsieve_addrptr; /* pointer to sieve string for address lexer */
--char *libsieve_addrerr; /* buffer for sieve parser error messages */
-+extern char *libsieve_addrptr; /* pointer to sieve string for address lexer */
-+extern char *libsieve_addrerr; /* buffer for sieve parser error messages */
-
- static int static_verify_address(const char *s)
- {
Copied: trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c.diff (from rev 31107, trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c)
===================================================================
--- trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c.diff (rev 0)
+++ trunk/dports/mail/libsieve/files/patch-src__sv_parser__sieve.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,13 @@
+--- src/sv_parser/sieve.c 2006-12-08 06:53:58.000000000 +0000
++++ src/sv_parser/sieve.c.new 2007-04-04 14:02:17.000000000 +0000
+@@ -2819,8 +2819,8 @@
+ return 1;
+ }
+
+-char *libsieve_addrptr; /* pointer to sieve string for address lexer */
+-char *libsieve_addrerr; /* buffer for sieve parser error messages */
++extern char *libsieve_addrptr; /* pointer to sieve string for address lexer */
++extern char *libsieve_addrerr; /* buffer for sieve parser error messages */
+
+ static int static_verify_address(const char *s)
+ {
Modified: trunk/dports/multimedia/libmms/Portfile
===================================================================
--- trunk/dports/multimedia/libmms/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/libmms/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -19,7 +19,7 @@
checksums md5 1601705f38143687a575630a3f9d6a56 \
sha1 a0774efbc91b6bb4ba2211bc4936bbbf798ec386 \
rmd160 9de71af7ad5a056ce3554bdfcb5219504aa4d8e4
-patchfiles patch-src__uri.c
+patchfiles patch-src__uri.c.diff
depends_lib port:pkgconfig port:glib2 port:libiconv port:gettext
configure.args-append \
--mandir=${prefix}/share/man --infodir=${prefix}/share/info
Deleted: trunk/dports/multimedia/libmms/files/patch-src__uri.c
===================================================================
--- trunk/dports/multimedia/libmms/files/patch-src__uri.c 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/libmms/files/patch-src__uri.c 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- src/uri.c 2004-12-01 00:27:02.000000000 +0000
-+++ src/uri.c.new 2007-06-04 22:13:26.000000000 +0000
-@@ -20,7 +20,7 @@
- /* FIXME: #include "gnet-private.h" */
- #include <glib.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <ctype.h>
-
- #include "uri.h"
Copied: trunk/dports/multimedia/libmms/files/patch-src__uri.c.diff (from rev 31107, trunk/dports/multimedia/libmms/files/patch-src__uri.c)
===================================================================
--- trunk/dports/multimedia/libmms/files/patch-src__uri.c.diff (rev 0)
+++ trunk/dports/multimedia/libmms/files/patch-src__uri.c.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- src/uri.c 2004-12-01 00:27:02.000000000 +0000
++++ src/uri.c.new 2007-06-04 22:13:26.000000000 +0000
+@@ -20,7 +20,7 @@
+ /* FIXME: #include "gnet-private.h" */
+ #include <glib.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <ctype.h>
+
+ #include "uri.h"
Modified: trunk/dports/multimedia/mimms/Portfile
===================================================================
--- trunk/dports/multimedia/mimms/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/mimms/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -20,7 +20,7 @@
sha1 197f4c89c74d40a7aec382d20160a746946ce795 \
rmd160 a23430022371c530e91b7991f52275e545f61e3d
use_bzip2 yes
-patchfiles patch-mimms.cpp patch-mimms.pro
+patchfiles patch-mimms.cpp.diff patch-mimms.pro.diff
depends_lib port:libmms
pre-fetch {
if {![variant_isset qt4] && ![variant_isset qt4_mac]} {
@@ -42,11 +42,11 @@
destroot.destdir-append PREFIX=${prefix}
variant qt4 conflicts qt4_mac description {Links MiMMS against the qt4 port} {
- patchfiles-append patch-Makefile.qt4
+ patchfiles-append patch-Makefile.qt4.diff
depends_lib-append port:qt4
}
variant qt4_mac conflicts qt4 description {Links MiMMS against the qt4-mac port} {
- patchfiles-append patch-Makefile.qt4-mac
+ patchfiles-append patch-Makefile.qt4-mac.diff
depends_lib-append port:qt4-mac
}
Deleted: trunk/dports/multimedia/mimms/files/patch-Makefile.qt4
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-Makefile.qt4 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/mimms/files/patch-Makefile.qt4 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,13 +0,0 @@
---- Makefile 2006-08-17 20:03:52.000000000 +0000
-+++ Makefile.new 2007-06-13 05:57:57.000000000 +0000
-@@ -16,8 +16,8 @@
- $(MAKE) -f Makefile.qmake
-
- install: build
-- $(INSTALL) -m755 -D mimms $(DESTDIR)/$(BINDIR)/mimms
-- $(INSTALL) -m644 -D mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
-+ $(INSTALL) -m755 mimms $(DESTDIR)/$(BINDIR)/mimms
-+ $(INSTALL) -m644 mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
-
- clean:
- rm -f Makefile.qmake *.o mimms *~
Deleted: trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,13 +0,0 @@
---- Makefile 2006-08-17 20:03:52.000000000 +0000
-+++ Makefile.new 2007-06-13 05:57:57.000000000 +0000
-@@ -16,8 +16,8 @@
- $(MAKE) -f Makefile.qmake
-
- install: build
-- $(INSTALL) -m755 -D mimms $(DESTDIR)/$(BINDIR)/mimms
-- $(INSTALL) -m644 -D mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
-+ $(INSTALL) -m755 mimms.app/Contents/MacOS/mimms $(DESTDIR)$(BINDIR)/mimms
-+ $(INSTALL) -m644 mimms.1 $(DESTDIR)$(MANDIR)/man1/mimms.1
-
- clean:
- rm -f Makefile.qmake *.o mimms *~
Copied: trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac.diff (from rev 31107, trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac)
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac.diff (rev 0)
+++ trunk/dports/multimedia/mimms/files/patch-Makefile.qt4-mac.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,13 @@
+--- Makefile 2006-08-17 20:03:52.000000000 +0000
++++ Makefile.new 2007-06-13 05:57:57.000000000 +0000
+@@ -16,8 +16,8 @@
+ $(MAKE) -f Makefile.qmake
+
+ install: build
+- $(INSTALL) -m755 -D mimms $(DESTDIR)/$(BINDIR)/mimms
+- $(INSTALL) -m644 -D mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
++ $(INSTALL) -m755 mimms.app/Contents/MacOS/mimms $(DESTDIR)$(BINDIR)/mimms
++ $(INSTALL) -m644 mimms.1 $(DESTDIR)$(MANDIR)/man1/mimms.1
+
+ clean:
+ rm -f Makefile.qmake *.o mimms *~
Copied: trunk/dports/multimedia/mimms/files/patch-Makefile.qt4.diff (from rev 31107, trunk/dports/multimedia/mimms/files/patch-Makefile.qt4)
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-Makefile.qt4.diff (rev 0)
+++ trunk/dports/multimedia/mimms/files/patch-Makefile.qt4.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,13 @@
+--- Makefile 2006-08-17 20:03:52.000000000 +0000
++++ Makefile.new 2007-06-13 05:57:57.000000000 +0000
+@@ -16,8 +16,8 @@
+ $(MAKE) -f Makefile.qmake
+
+ install: build
+- $(INSTALL) -m755 -D mimms $(DESTDIR)/$(BINDIR)/mimms
+- $(INSTALL) -m644 -D mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
++ $(INSTALL) -m755 mimms $(DESTDIR)/$(BINDIR)/mimms
++ $(INSTALL) -m644 mimms.1 $(DESTDIR)/$(MANDIR)/man1/mimms.1
+
+ clean:
+ rm -f Makefile.qmake *.o mimms *~
Deleted: trunk/dports/multimedia/mimms/files/patch-mimms.cpp
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-mimms.cpp 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/mimms/files/patch-mimms.cpp 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,88 +0,0 @@
---- mimms.cpp 2006-08-17 20:06:13.000000000 +0000
-+++ mimms.cpp.new 2007-06-13 05:54:09.000000000 +0000
-@@ -36,7 +36,7 @@
- QString url;
- Scheme scheme;
- QString output;
-- bool stdout;
-+ bool stdout_opt;
- bool clobber;
- quint32 time;
- bool verbose;
-@@ -62,7 +62,7 @@
- "UNKNOWN"
- );
- qDebug("output = '%s'", __options.output.toUtf8().data());
-- qDebug("stdout = '%s'", __options.stdout?"true":"false");
-+ qDebug("stdout = '%s'", __options.stdout_opt?"true":"false");
- qDebug("clobber = '%s'", __options.clobber?"true":"false");
- qDebug("time = '%d'", __options.time);
- qDebug("verbose = '%s'", __options.verbose?"true":"false");
-@@ -87,7 +87,7 @@
- QStringList args = arguments();
- bool literal_mode = false;
-
-- __options.stdout = false;
-+ __options.stdout_opt = false;
- __options.clobber = false;
- __options.time = 0;
- __options.verbose = false;
-@@ -160,7 +160,7 @@
- __options.output = args[i];
- if (__options.output == "-") {
- __options.quiet = true;
-- __options.stdout = true;
-+ __options.stdout_opt = true;
- }
- } else {
- qWarning("Too many arguments: '%s'", args[i].toUtf8().data());
-@@ -241,7 +241,7 @@
- if (app.options().scheme == MiMMSOptions::HTTP ||
- app.options().scheme == MiMMSOptions::STDIN) {
-
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- out << "Searching for MMS URL...";
- out.flush();
- }
-@@ -301,12 +301,12 @@
- }
- }
-
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- out << "\r ";
- out << "\r<" << url << "> => " << "'" << file.fileName() << "'" << endl;
- }
-
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- out << "Connecting...";
- out.flush();
- }
-@@ -389,14 +389,14 @@
-
- if (endDateTime.isValid()) {
- if (QDateTime::currentDateTime() > endDateTime) {
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- qDebug("\rRecording time limit exceeded.");
- break;
- }
- }
- }
-
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- off_t pos = mms ? mms_get_current_pos(mms) : mmsh_get_current_pos(mmsh);
-
- bytes_in_duration += bytes;
-@@ -458,7 +458,7 @@
- file.close();
- delete buffer;
-
-- if (!app.options().quiet && !app.options().stdout) {
-+ if (!app.options().quiet && !app.options().stdout_opt) {
- out << "\rStream download completed.\n";
- out.flush();
- }
Copied: trunk/dports/multimedia/mimms/files/patch-mimms.cpp.diff (from rev 31107, trunk/dports/multimedia/mimms/files/patch-mimms.cpp)
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-mimms.cpp.diff (rev 0)
+++ trunk/dports/multimedia/mimms/files/patch-mimms.cpp.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,88 @@
+--- mimms.cpp 2006-08-17 20:06:13.000000000 +0000
++++ mimms.cpp.new 2007-06-13 05:54:09.000000000 +0000
+@@ -36,7 +36,7 @@
+ QString url;
+ Scheme scheme;
+ QString output;
+- bool stdout;
++ bool stdout_opt;
+ bool clobber;
+ quint32 time;
+ bool verbose;
+@@ -62,7 +62,7 @@
+ "UNKNOWN"
+ );
+ qDebug("output = '%s'", __options.output.toUtf8().data());
+- qDebug("stdout = '%s'", __options.stdout?"true":"false");
++ qDebug("stdout = '%s'", __options.stdout_opt?"true":"false");
+ qDebug("clobber = '%s'", __options.clobber?"true":"false");
+ qDebug("time = '%d'", __options.time);
+ qDebug("verbose = '%s'", __options.verbose?"true":"false");
+@@ -87,7 +87,7 @@
+ QStringList args = arguments();
+ bool literal_mode = false;
+
+- __options.stdout = false;
++ __options.stdout_opt = false;
+ __options.clobber = false;
+ __options.time = 0;
+ __options.verbose = false;
+@@ -160,7 +160,7 @@
+ __options.output = args[i];
+ if (__options.output == "-") {
+ __options.quiet = true;
+- __options.stdout = true;
++ __options.stdout_opt = true;
+ }
+ } else {
+ qWarning("Too many arguments: '%s'", args[i].toUtf8().data());
+@@ -241,7 +241,7 @@
+ if (app.options().scheme == MiMMSOptions::HTTP ||
+ app.options().scheme == MiMMSOptions::STDIN) {
+
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ out << "Searching for MMS URL...";
+ out.flush();
+ }
+@@ -301,12 +301,12 @@
+ }
+ }
+
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ out << "\r ";
+ out << "\r<" << url << "> => " << "'" << file.fileName() << "'" << endl;
+ }
+
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ out << "Connecting...";
+ out.flush();
+ }
+@@ -389,14 +389,14 @@
+
+ if (endDateTime.isValid()) {
+ if (QDateTime::currentDateTime() > endDateTime) {
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ qDebug("\rRecording time limit exceeded.");
+ break;
+ }
+ }
+ }
+
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ off_t pos = mms ? mms_get_current_pos(mms) : mmsh_get_current_pos(mmsh);
+
+ bytes_in_duration += bytes;
+@@ -458,7 +458,7 @@
+ file.close();
+ delete buffer;
+
+- if (!app.options().quiet && !app.options().stdout) {
++ if (!app.options().quiet && !app.options().stdout_opt) {
+ out << "\rStream download completed.\n";
+ out.flush();
+ }
Deleted: trunk/dports/multimedia/mimms/files/patch-mimms.pro
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-mimms.pro 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/multimedia/mimms/files/patch-mimms.pro 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- mimms.pro 2006-06-05 00:24:32.000000000 +0000
-+++ mimms.pro.new 2007-06-13 05:47:57.000000000 +0000
-@@ -5,7 +5,7 @@
- TEMPLATE = app
- TARGET +=
- DEPENDPATH += .
--INCLUDEPATH += . libmms /usr/include/libmms /usr/include/glib-2.0 /usr/lib/glib-2.0/include
-+INCLUDEPATH += . libmms @prefix@/include/libmms @prefix@/include/glib-2.0 @prefix@/lib/glib-2.0/include
- CONFIG += release
- LIBS += -lmms
- QT -= gui
Copied: trunk/dports/multimedia/mimms/files/patch-mimms.pro.diff (from rev 31107, trunk/dports/multimedia/mimms/files/patch-mimms.pro)
===================================================================
--- trunk/dports/multimedia/mimms/files/patch-mimms.pro.diff (rev 0)
+++ trunk/dports/multimedia/mimms/files/patch-mimms.pro.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- mimms.pro 2006-06-05 00:24:32.000000000 +0000
++++ mimms.pro.new 2007-06-13 05:47:57.000000000 +0000
+@@ -5,7 +5,7 @@
+ TEMPLATE = app
+ TARGET +=
+ DEPENDPATH += .
+-INCLUDEPATH += . libmms /usr/include/libmms /usr/include/glib-2.0 /usr/lib/glib-2.0/include
++INCLUDEPATH += . libmms @prefix@/include/libmms @prefix@/include/glib-2.0 @prefix@/lib/glib-2.0/include
+ CONFIG += release
+ LIBS += -lmms
+ QT -= gui
Modified: trunk/dports/net/dsocks/Portfile
===================================================================
--- trunk/dports/net/dsocks/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/dsocks/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -20,17 +20,17 @@
depends_run bin:ssh:openssh
platform darwin 8 {
- patchfiles-append patch-dsocks.sh patch-dsocks-torify.sh
+ patchfiles-append patch-dsocks.sh.diff patch-dsocks-torify.sh.diff
}
# Darwin 7 and earlier (Mac OS X 10.3 and earlier) need dsocks.h to explicitly
# include stdint.h. patch-dsocks.h does this.
platform darwin 7 {
- patchfiles-append patch-dsocks.sh patch-dsocks-torify.sh patch-dsocks.h
+ patchfiles-append patch-dsocks.sh.diff patch-dsocks-torify.sh.diff patch-dsocks.h.diff
}
platform darwin 6 {
- patchfiles-append patch-dsocks.sh patch-dsocks-torify.sh patch-dsocks.h
+ patchfiles-append patch-dsocks.sh.diff patch-dsocks-torify.sh.diff patch-dsocks.h.diff
}
post-patch {
Deleted: trunk/dports/net/dsocks/files/patch-dsocks-torify.sh
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks-torify.sh 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/dsocks/files/patch-dsocks-torify.sh 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,13 +0,0 @@
---- dsocks-torify.sh 2006-10-12 04:13:58.000000000 +0000
-+++ dsocks-torify.sh.darwin 2007-02-14 13:11:57.000000000 +0000
-@@ -7,8 +7,5 @@
- # you probably want to run tor-dns-proxy.py also...
-
- # for MacOS X...
--#LIBDSOCKS=/usr/local/lib/libdsocks.dylib
--#DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
--
--LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
--LD_PRELOAD=$LIBDSOCKS exec "$@"
-+LIBDSOCKS=/usr/local/lib/libdsocks.dylib
-+DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
Copied: trunk/dports/net/dsocks/files/patch-dsocks-torify.sh.diff (from rev 31107, trunk/dports/net/dsocks/files/patch-dsocks-torify.sh)
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks-torify.sh.diff (rev 0)
+++ trunk/dports/net/dsocks/files/patch-dsocks-torify.sh.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,13 @@
+--- dsocks-torify.sh 2006-10-12 04:13:58.000000000 +0000
++++ dsocks-torify.sh.darwin 2007-02-14 13:11:57.000000000 +0000
+@@ -7,8 +7,5 @@
+ # you probably want to run tor-dns-proxy.py also...
+
+ # for MacOS X...
+-#LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+-#DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+-
+-LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
+-LD_PRELOAD=$LIBDSOCKS exec "$@"
++LIBDSOCKS=/usr/local/lib/libdsocks.dylib
++DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
Deleted: trunk/dports/net/dsocks/files/patch-dsocks.h
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks.h 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/dsocks/files/patch-dsocks.h 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- dsocks.h 2007-08-17 04:50:03.000000000 +0000
-+++ dsocks.h.darwin-7 2007-08-23 06:01:10.000000000 +0000
-@@ -9,6 +9,8 @@
- #ifndef DSOCKS_H
- #define DSOCKS_H
-
-+#include <stdint.h>
-+
- struct dsocks4_hdr {
- uint8_t vn; /* version number */
- uint8_t cd; /* command code */
Copied: trunk/dports/net/dsocks/files/patch-dsocks.h.diff (from rev 31107, trunk/dports/net/dsocks/files/patch-dsocks.h)
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks.h.diff (rev 0)
+++ trunk/dports/net/dsocks/files/patch-dsocks.h.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- dsocks.h 2007-08-17 04:50:03.000000000 +0000
++++ dsocks.h.darwin-7 2007-08-23 06:01:10.000000000 +0000
+@@ -9,6 +9,8 @@
+ #ifndef DSOCKS_H
+ #define DSOCKS_H
+
++#include <stdint.h>
++
+ struct dsocks4_hdr {
+ uint8_t vn; /* version number */
+ uint8_t cd; /* command code */
Deleted: trunk/dports/net/dsocks/files/patch-dsocks.sh
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks.sh 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/dsocks/files/patch-dsocks.sh 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,13 +0,0 @@
---- dsocks.sh 2006-10-12 04:13:58.000000000 +0000
-+++ dsocks.sh.darwin 2007-02-14 13:11:57.000000000 +0000
-@@ -8,8 +8,5 @@
- #export LOCALDOMAIN="int.example.com"
-
- # for MacOS X...
--#LIBDSOCKS=/usr/local/lib/libdsocks.dylib
--#DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
--
--LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
--LD_PRELOAD=$LIBDSOCKS exec "$@"
-+LIBDSOCKS=/usr/local/lib/libdsocks.dylib
-+DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
Copied: trunk/dports/net/dsocks/files/patch-dsocks.sh.diff (from rev 31107, trunk/dports/net/dsocks/files/patch-dsocks.sh)
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks.sh.diff (rev 0)
+++ trunk/dports/net/dsocks/files/patch-dsocks.sh.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,13 @@
+--- dsocks.sh 2006-10-12 04:13:58.000000000 +0000
++++ dsocks.sh.darwin 2007-02-14 13:11:57.000000000 +0000
+@@ -8,8 +8,5 @@
+ #export LOCALDOMAIN="int.example.com"
+
+ # for MacOS X...
+-#LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+-#DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+-
+-LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
+-LD_PRELOAD=$LIBDSOCKS exec "$@"
++LIBDSOCKS=/usr/local/lib/libdsocks.dylib
++DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
Modified: trunk/dports/net/maradns/Portfile
===================================================================
--- trunk/dports/net/maradns/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/maradns/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -24,8 +24,8 @@
use_bzip2 yes
-patchfiles patch-configure patch-install.darwin \
- patch-build__Makefile.darwin
+patchfiles patch-configure.diff patch-install.darwin.diff \
+ patch-build__Makefile.darwin.diff
post-extract {
# Delete unneeded stress-testing code (not built by default). It may be worth
Deleted: trunk/dports/net/maradns/files/patch-build__Makefile.darwin
===================================================================
--- trunk/dports/net/maradns/files/patch-build__Makefile.darwin 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/maradns/files/patch-build__Makefile.darwin 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- build/Makefile.darwin 2004-06-01 17:41:00.000000000 +0000
-+++ build/Makefile.darwin.new 2007-09-14 15:55:26.000000000 +0000
-@@ -14,7 +14,7 @@
- EXECS=server/maradns
-
- # The Darwin-specific stuff
--CC=gcc $(LDFLAGS) -DDARWIN
-+CC=gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DDARWIN
- M=VERSION=$(VERSION) "CC=$(CC)"
-
- #FLAGS = -O2 -Wall
Copied: trunk/dports/net/maradns/files/patch-build__Makefile.darwin.diff (from rev 31107, trunk/dports/net/maradns/files/patch-build__Makefile.darwin)
===================================================================
--- trunk/dports/net/maradns/files/patch-build__Makefile.darwin.diff (rev 0)
+++ trunk/dports/net/maradns/files/patch-build__Makefile.darwin.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- build/Makefile.darwin 2004-06-01 17:41:00.000000000 +0000
++++ build/Makefile.darwin.new 2007-09-14 15:55:26.000000000 +0000
+@@ -14,7 +14,7 @@
+ EXECS=server/maradns
+
+ # The Darwin-specific stuff
+-CC=gcc $(LDFLAGS) -DDARWIN
++CC=gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DDARWIN
+ M=VERSION=$(VERSION) "CC=$(CC)"
+
+ #FLAGS = -O2 -Wall
Deleted: trunk/dports/net/maradns/files/patch-configure
===================================================================
--- trunk/dports/net/maradns/files/patch-configure 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/maradns/files/patch-configure 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- configure 2006-05-16 09:28:36.000000000 +1000
-+++ configure.new 2007-02-02 16:53:12.000000000 +1100
-@@ -114,7 +114,7 @@
- echo \(if you typed in \"make\" before, just type it again\)
- echo
- echo THIS PORT HAS NOT BEEN FULLY TESTED\; USE AT YOUR OWN RISK
-- EXITCODE=1
-+ EXITCODE=0
- # This is a a template for adding support to a new OS for MaraDNS.
- # Some points: If you port MaraDNS, make sure the underlying OS has
- # /dev/urandom support or have the default mararc have a
Copied: trunk/dports/net/maradns/files/patch-configure.diff (from rev 31107, trunk/dports/net/maradns/files/patch-configure)
===================================================================
--- trunk/dports/net/maradns/files/patch-configure.diff (rev 0)
+++ trunk/dports/net/maradns/files/patch-configure.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- configure 2006-05-16 09:28:36.000000000 +1000
++++ configure.new 2007-02-02 16:53:12.000000000 +1100
+@@ -114,7 +114,7 @@
+ echo \(if you typed in \"make\" before, just type it again\)
+ echo
+ echo THIS PORT HAS NOT BEEN FULLY TESTED\; USE AT YOUR OWN RISK
+- EXITCODE=1
++ EXITCODE=0
+ # This is a a template for adding support to a new OS for MaraDNS.
+ # Some points: If you port MaraDNS, make sure the underlying OS has
+ # /dev/urandom support or have the default mararc have a
Deleted: trunk/dports/net/maradns/files/patch-install.darwin
===================================================================
--- trunk/dports/net/maradns/files/patch-install.darwin 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/maradns/files/patch-install.darwin 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- build/install.darwin 2005-02-20 06:04:35.000000000 +1100
-+++ build/install.darwin.new 2007-02-04 16:52:16.000000000 +1100
-@@ -35,7 +35,7 @@
- # The directory to put man pages which describe the server programs
- MAN8="$PREFIX/share/man/man8/"
- # The directory to put a copy of the MaraDNS documents on the system
--DOCS="$PREFIX/maradns-$VERSION"
-+DOCS="$PREFIX/share/doc/maradns-$VERSION"
-
- # Mandrake does not have a /usr/local/man. Ugh.
- # As a result, we need the following kludge to get this to
Copied: trunk/dports/net/maradns/files/patch-install.darwin.diff (from rev 31107, trunk/dports/net/maradns/files/patch-install.darwin)
===================================================================
--- trunk/dports/net/maradns/files/patch-install.darwin.diff (rev 0)
+++ trunk/dports/net/maradns/files/patch-install.darwin.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- build/install.darwin 2005-02-20 06:04:35.000000000 +1100
++++ build/install.darwin.new 2007-02-04 16:52:16.000000000 +1100
+@@ -35,7 +35,7 @@
+ # The directory to put man pages which describe the server programs
+ MAN8="$PREFIX/share/man/man8/"
+ # The directory to put a copy of the MaraDNS documents on the system
+-DOCS="$PREFIX/maradns-$VERSION"
++DOCS="$PREFIX/share/doc/maradns-$VERSION"
+
+ # Mandrake does not have a /usr/local/man. Ugh.
+ # As a result, we need the following kludge to get this to
Modified: trunk/dports/net/packetforward/Portfile
===================================================================
--- trunk/dports/net/packetforward/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/packetforward/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -18,7 +18,7 @@
sha1 2df295baede644af9966084e92fa257648b75777 \
rmd160 da60a8373007c9c64e3989a9e27e605db7c0289a
depends_lib port:libpcap port:libnet
-patchfiles patch-Makefile
+patchfiles patch-Makefile.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
}
Deleted: trunk/dports/net/packetforward/files/patch-Makefile
===================================================================
--- trunk/dports/net/packetforward/files/patch-Makefile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/net/packetforward/files/patch-Makefile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,18 +0,0 @@
---- Makefile 2007-02-23 00:00:30.000000000 +0000
-+++ Makefile.new 2007-06-20 15:54:01.000000000 +0000
-@@ -1,9 +1,11 @@
- all:
-- gcc packetforward.c -o packetforward -I/usr/include -L/usr/lib -lpcap `libnet-config --defines --cflags --libs`
-+ gcc packetforward.c -o packetforward -I at PREFIX@/include -L at PREFIX@/lib -lpcap `libnet-config --defines --cflags --libs`
-
- install:
-- cp -f packetforward /usr/bin/packetforward
-+ cp -f packetforward $(DESTDIR)@PREFIX@/bin/packetforward
-+ install -m 755 -d $(DESTDIR)@PREFIX@/share/doc/packetforward
-+ install -m 644 ChangeLog LICENSE README $(DESTDIR)@PREFIX@/share/doc/packetforward
-
- clean:
- rm -f /usr/bin/packetforward
--
-\ No newline at end of file
-+
Copied: trunk/dports/net/packetforward/files/patch-Makefile.diff (from rev 31107, trunk/dports/net/packetforward/files/patch-Makefile)
===================================================================
--- trunk/dports/net/packetforward/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/net/packetforward/files/patch-Makefile.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,18 @@
+--- Makefile 2007-02-23 00:00:30.000000000 +0000
++++ Makefile.new 2007-06-20 15:54:01.000000000 +0000
+@@ -1,9 +1,11 @@
+ all:
+- gcc packetforward.c -o packetforward -I/usr/include -L/usr/lib -lpcap `libnet-config --defines --cflags --libs`
++ gcc packetforward.c -o packetforward -I at PREFIX@/include -L at PREFIX@/lib -lpcap `libnet-config --defines --cflags --libs`
+
+ install:
+- cp -f packetforward /usr/bin/packetforward
++ cp -f packetforward $(DESTDIR)@PREFIX@/bin/packetforward
++ install -m 755 -d $(DESTDIR)@PREFIX@/share/doc/packetforward
++ install -m 644 ChangeLog LICENSE README $(DESTDIR)@PREFIX@/share/doc/packetforward
+
+ clean:
+ rm -f /usr/bin/packetforward
+-
+\ No newline at end of file
++
Modified: trunk/dports/security/gpg-agent/Portfile
===================================================================
--- trunk/dports/security/gpg-agent/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/security/gpg-agent/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -34,7 +34,7 @@
port:pth \
port:pinentry
-patchfiles patch-po_Makevars
+patchfiles patch-po_Makevars.diff
platform darwin {
configure.env-append MACOSX_DEPLOYMENT_TARGET=10.3
Deleted: trunk/dports/security/gpg-agent/files/patch-configure
===================================================================
--- trunk/dports/security/gpg-agent/files/patch-configure 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/security/gpg-agent/files/patch-configure 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,16 +0,0 @@
---- configure 2007-01-31 14:09:31.000000000 +0000
-+++ configure.gpg-agent 2007-02-20 01:24:54.000000000 +0000
-@@ -557,10 +557,10 @@
- SHELL=${CONFIG_SHELL-/bin/sh}
-
- # Identity of this package.
--PACKAGE_NAME='gnupg'
--PACKAGE_TARNAME='gnupg'
-+PACKAGE_NAME='gpg-agent'
-+PACKAGE_TARNAME='gpg-agent'
- PACKAGE_VERSION='2.0.7'
--PACKAGE_STRING='gnupg 2.0.7'
-+PACKAGE_STRING='gpg-agent 2.0.7'
- PACKAGE_BUGREPORT='bug-gnupg at gnupg.org'
-
- ac_unique_file="sm/gpgsm.c"
Copied: trunk/dports/security/gpg-agent/files/patch-configure.diff (from rev 31107, trunk/dports/security/gpg-agent/files/patch-configure)
===================================================================
--- trunk/dports/security/gpg-agent/files/patch-configure.diff (rev 0)
+++ trunk/dports/security/gpg-agent/files/patch-configure.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,16 @@
+--- configure 2007-01-31 14:09:31.000000000 +0000
++++ configure.gpg-agent 2007-02-20 01:24:54.000000000 +0000
+@@ -557,10 +557,10 @@
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+ # Identity of this package.
+-PACKAGE_NAME='gnupg'
+-PACKAGE_TARNAME='gnupg'
++PACKAGE_NAME='gpg-agent'
++PACKAGE_TARNAME='gpg-agent'
+ PACKAGE_VERSION='2.0.7'
+-PACKAGE_STRING='gnupg 2.0.7'
++PACKAGE_STRING='gpg-agent 2.0.7'
+ PACKAGE_BUGREPORT='bug-gnupg at gnupg.org'
+
+ ac_unique_file="sm/gpgsm.c"
Deleted: trunk/dports/security/gpg-agent/files/patch-po_Makevars
===================================================================
--- trunk/dports/security/gpg-agent/files/patch-po_Makevars 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/security/gpg-agent/files/patch-po_Makevars 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,11 +0,0 @@
---- po/Makevars 2006-06-20 16:32:59.000000000 +0000
-+++ po/Makevars.gpg-agent 2007-02-20 01:36:11.000000000 +0000
-@@ -1,7 +1,7 @@
- # Makefile variables for PO directory in any package using GNU gettext.
-
- # Usually the message domain is the same as the package name.
--DOMAIN = gnupg2
-+DOMAIN = gpg-agent
-
- # These two variables depend on the location of this directory.
- subdir = po
Copied: trunk/dports/security/gpg-agent/files/patch-po_Makevars.diff (from rev 31107, trunk/dports/security/gpg-agent/files/patch-po_Makevars)
===================================================================
--- trunk/dports/security/gpg-agent/files/patch-po_Makevars.diff (rev 0)
+++ trunk/dports/security/gpg-agent/files/patch-po_Makevars.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,11 @@
+--- po/Makevars 2006-06-20 16:32:59.000000000 +0000
++++ po/Makevars.gpg-agent 2007-02-20 01:36:11.000000000 +0000
+@@ -1,7 +1,7 @@
+ # Makefile variables for PO directory in any package using GNU gettext.
+
+ # Usually the message domain is the same as the package name.
+-DOMAIN = gnupg2
++DOMAIN = gpg-agent
+
+ # These two variables depend on the location of this directory.
+ subdir = po
Modified: trunk/dports/sysutils/getopt/Portfile
===================================================================
--- trunk/dports/sysutils/getopt/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/sysutils/getopt/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -28,7 +28,7 @@
sha1 8b9b329b3a8f5d52c91c0381616ecbd1ba291486 \
rmd160 79fffccf1b48956bfc1fbb19c22c2d94adf10dff
-patchfiles patch-Makefile
+patchfiles patch-Makefile.diff
depends_lib port:gettext
Deleted: trunk/dports/sysutils/getopt/files/patch-Makefile
===================================================================
--- trunk/dports/sysutils/getopt/files/patch-Makefile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/sysutils/getopt/files/patch-Makefile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,20 +0,0 @@
---- Makefile.orig Thu Jan 23 13:52:29 2003
-+++ Makefile Wed Sep 10 00:40:53 2003
-@@ -29,7 +29,7 @@
- LANGUAGES = cs de es fr it ja nl pt_BR
- MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
-
--CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX
-+CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -I$(prefix)/include
- ifeq ($(LIBCGETOPT),0)
- CPPFLAGS+=-I./gnu
- endif
-@@ -40,7 +40,7 @@
- -Wnested-externs -Winline
- OPTIMIZE=-O3 -fno-strength-reduce
- CFLAGS=$(WARNINGS) $(OPTIMIZE)
--LDFLAGS=
-+LDFLAGS=-L$(prefix)/lib -lintl
-
- sources=getopt.c
- ifeq ($(LIBCGETOPT),0)
Copied: trunk/dports/sysutils/getopt/files/patch-Makefile.diff (from rev 31107, trunk/dports/sysutils/getopt/files/patch-Makefile)
===================================================================
--- trunk/dports/sysutils/getopt/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/sysutils/getopt/files/patch-Makefile.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,20 @@
+--- Makefile.orig Thu Jan 23 13:52:29 2003
++++ Makefile Wed Sep 10 00:40:53 2003
+@@ -29,7 +29,7 @@
+ LANGUAGES = cs de es fr it ja nl pt_BR
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -I$(prefix)/include
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu
+ endif
+@@ -40,7 +40,7 @@
+ -Wnested-externs -Winline
+ OPTIMIZE=-O3 -fno-strength-reduce
+ CFLAGS=$(WARNINGS) $(OPTIMIZE)
+-LDFLAGS=
++LDFLAGS=-L$(prefix)/lib -lintl
+
+ sources=getopt.c
+ ifeq ($(LIBCGETOPT),0)
Modified: trunk/dports/textproc/fop-0.20/Portfile
===================================================================
--- trunk/dports/textproc/fop-0.20/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/textproc/fop-0.20/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -29,7 +29,7 @@
checksums md5 d6b43e3eddf9378536ad8127bc057d41 \
sha1 ab650c5f253b1a7994776a15bc5e9abc54ff7687 \
rmd160 59baae8df3642ca671fb4c6528082cf9d0b92f3b
-patchfiles patch-fop.sh patch-xalan.sh
+patchfiles patch-fop.sh.diff patch-xalan.sh.diff
worksrcdir fop-${version}
use_configure no
Deleted: trunk/dports/textproc/fop-0.20/files/patch-fop.sh
===================================================================
--- trunk/dports/textproc/fop-0.20/files/patch-fop.sh 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/textproc/fop-0.20/files/patch-fop.sh 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,15 +0,0 @@
---- fop.sh 2003-07-15 02:04:02.000000000 +0000
-+++ fop.sh.new 2007-06-14 14:22:28.000000000 +0000
-@@ -11,7 +11,11 @@
- darwin=false;
- case "`uname`" in
- CYGWIN*) cygwin=true ;;
-- Darwin*) darwin=true ;;
-+ Darwin*) darwin=true
-+ if [ -z "$JAVA_HOME" ] ; then
-+ JAVA_HOME=/Library/Java/Home
-+ fi
-+ ;;
- esac
-
- if [ -z "$FOP_HOME" ] ; then
Copied: trunk/dports/textproc/fop-0.20/files/patch-fop.sh.diff (from rev 31107, trunk/dports/textproc/fop-0.20/files/patch-fop.sh)
===================================================================
--- trunk/dports/textproc/fop-0.20/files/patch-fop.sh.diff (rev 0)
+++ trunk/dports/textproc/fop-0.20/files/patch-fop.sh.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,15 @@
+--- fop.sh 2003-07-15 02:04:02.000000000 +0000
++++ fop.sh.new 2007-06-14 14:22:28.000000000 +0000
+@@ -11,7 +11,11 @@
+ darwin=false;
+ case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+- Darwin*) darwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++ JAVA_HOME=/Library/Java/Home
++ fi
++ ;;
+ esac
+
+ if [ -z "$FOP_HOME" ] ; then
Deleted: trunk/dports/textproc/fop-0.20/files/patch-xalan.sh
===================================================================
--- trunk/dports/textproc/fop-0.20/files/patch-xalan.sh 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/textproc/fop-0.20/files/patch-xalan.sh 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,15 +0,0 @@
---- xalan.sh 2003-07-15 02:04:08.000000000 +0000
-+++ xalan.sh.new 2007-06-14 14:24:19.000000000 +0000
-@@ -11,7 +11,11 @@
- darwin=false;
- case "`uname`" in
- CYGWIN*) cygwin=true ;;
-- Darwin*) darwin=true ;;
-+ Darwin*) darwin=true
-+ if [ -z "$JAVA_HOME" ] ; then
-+ JAVA_HOME=/Library/Java/Home
-+ fi
-+ ;;
- esac
-
- if [ -z "$FOP_HOME" ] ; then
Copied: trunk/dports/textproc/fop-0.20/files/patch-xalan.sh.diff (from rev 31107, trunk/dports/textproc/fop-0.20/files/patch-xalan.sh)
===================================================================
--- trunk/dports/textproc/fop-0.20/files/patch-xalan.sh.diff (rev 0)
+++ trunk/dports/textproc/fop-0.20/files/patch-xalan.sh.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,15 @@
+--- xalan.sh 2003-07-15 02:04:08.000000000 +0000
++++ xalan.sh.new 2007-06-14 14:24:19.000000000 +0000
+@@ -11,7 +11,11 @@
+ darwin=false;
+ case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+- Darwin*) darwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++ JAVA_HOME=/Library/Java/Home
++ fi
++ ;;
+ esac
+
+ if [ -z "$FOP_HOME" ] ; then
Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/www/nginx/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -25,7 +25,7 @@
depends_lib port:pcre port:zlib
-patchfiles patch-auto__install patch-conf__nginx.conf
+patchfiles patch-auto__install.diff patch-conf__nginx.conf.diff
post-patch {
reinplace "s|__DESTROOT__|${destroot}|g" \
${worksrcpath}/auto/install
Deleted: trunk/dports/www/nginx/files/patch-auto__install
===================================================================
--- trunk/dports/www/nginx/files/patch-auto__install 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/www/nginx/files/patch-auto__install 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,70 +0,0 @@
---- auto/install 2006-08-30 10:39:17.000000000 +0000
-+++ auto/install.new 2007-05-12 09:36:11.000000000 +0000
-@@ -19,42 +19,44 @@
-
- install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
- $NGX_INSTALL_PERL_MODULES
-- test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
-+ test -d '__DESTROOT__$NGX_PREFIX' || mkdir -p '__DESTROOT__$NGX_PREFIX'
-
-- test -d '`dirname "$NGX_SBIN_PATH"`' \
-- || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
-- test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
-- cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
-+ test -d '`dirname "__DESTROOT__$NGX_SBIN_PATH"`' \
-+ || mkdir -p '`dirname "__DESTROOT__$NGX_SBIN_PATH"`'
-+ test ! -f '__DESTROOT__$NGX_SBIN_PATH' || mv '__DESTROOT__$NGX_SBIN_PATH' '__DESTROOT__$NGX_SBIN_PATH.old'
-+ cp $NGX_OBJS/nginx '__DESTROOT__$NGX_SBIN_PATH'
-
-- test -d '`dirname "$NGX_CONF_PATH"`' \
-- || mkdir -p '`dirname "$NGX_CONF_PATH"`'
-+ test -d '`dirname "__DESTROOT__$NGX_CONF_PATH"`' \
-+ || mkdir -p '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
-
-- cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
-- cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`'
-- cp conf/win-utf '`dirname "$NGX_CONF_PATH"`'
-+ cp conf/koi-win '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
-+ cp conf/koi-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
-+ cp conf/win-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
-
-- test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
-- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'
-- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
-+ test -f '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types' || \
-+ cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types'
-+ cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types.default'
-
-- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH'
-- cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
-+ test -f '__DESTROOT__$NGX_CONF_PATH' || cp conf/nginx.conf '__DESTROOT__$NGX_CONF_PATH'
-+ cp conf/nginx.conf '`dirname "__DESTROOT__$NGX_CONF_PATH"`/nginx.conf.default'
-
-- test -d '`dirname "$NGX_PID_PATH"`' \
-- || mkdir -p '`dirname "$NGX_PID_PATH"`'
-+ test -d '`dirname "__DESTROOT__$NGX_PID_PATH"`' \
-+ || mkdir -p '`dirname "__DESTROOT__$NGX_PID_PATH"`'
-
-- test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
-- mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
-+ test -d '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`' || \
-+ mkdir -p '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`'
-
-- test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
-+ test -d '__DESTROOT__$NGX_PREFIX/share/nginx/html' || \
-+ mkdir -p '__DESTROOT__$NGX_PREFIX/share/nginx/html' && \
-+ cp -r html '__DESTROOT__$NGX_PREFIX/share/nginx'
- END
-
-
--if test -n "$NGX_ERROR_LOG_PATH"; then
-+if test -n "__DESTROOT__$NGX_ERROR_LOG_PATH"; then
- cat << END >> $NGX_MAKEFILE
-
-- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
-- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
-+ test -d '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`' || \
-+ mkdir -p '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`'
- END
-
- fi
Copied: trunk/dports/www/nginx/files/patch-auto__install.diff (from rev 31107, trunk/dports/www/nginx/files/patch-auto__install)
===================================================================
--- trunk/dports/www/nginx/files/patch-auto__install.diff (rev 0)
+++ trunk/dports/www/nginx/files/patch-auto__install.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,70 @@
+--- auto/install 2006-08-30 10:39:17.000000000 +0000
++++ auto/install.new 2007-05-12 09:36:11.000000000 +0000
+@@ -19,42 +19,44 @@
+
+ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
+ $NGX_INSTALL_PERL_MODULES
+- test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
++ test -d '__DESTROOT__$NGX_PREFIX' || mkdir -p '__DESTROOT__$NGX_PREFIX'
+
+- test -d '`dirname "$NGX_SBIN_PATH"`' \
+- || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
+- test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
+- cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
++ test -d '`dirname "__DESTROOT__$NGX_SBIN_PATH"`' \
++ || mkdir -p '`dirname "__DESTROOT__$NGX_SBIN_PATH"`'
++ test ! -f '__DESTROOT__$NGX_SBIN_PATH' || mv '__DESTROOT__$NGX_SBIN_PATH' '__DESTROOT__$NGX_SBIN_PATH.old'
++ cp $NGX_OBJS/nginx '__DESTROOT__$NGX_SBIN_PATH'
+
+- test -d '`dirname "$NGX_CONF_PATH"`' \
+- || mkdir -p '`dirname "$NGX_CONF_PATH"`'
++ test -d '`dirname "__DESTROOT__$NGX_CONF_PATH"`' \
++ || mkdir -p '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
+
+- cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
+- cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`'
+- cp conf/win-utf '`dirname "$NGX_CONF_PATH"`'
++ cp conf/koi-win '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
++ cp conf/koi-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
++ cp conf/win-utf '`dirname "__DESTROOT__$NGX_CONF_PATH"`'
+
+- test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
+- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'
+- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
++ test -f '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types' || \
++ cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types'
++ cp conf/mime.types '`dirname "__DESTROOT__$NGX_CONF_PATH"`/mime.types.default'
+
+- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH'
+- cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
++ test -f '__DESTROOT__$NGX_CONF_PATH' || cp conf/nginx.conf '__DESTROOT__$NGX_CONF_PATH'
++ cp conf/nginx.conf '`dirname "__DESTROOT__$NGX_CONF_PATH"`/nginx.conf.default'
+
+- test -d '`dirname "$NGX_PID_PATH"`' \
+- || mkdir -p '`dirname "$NGX_PID_PATH"`'
++ test -d '`dirname "__DESTROOT__$NGX_PID_PATH"`' \
++ || mkdir -p '`dirname "__DESTROOT__$NGX_PID_PATH"`'
+
+- test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
+- mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
++ test -d '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`' || \
++ mkdir -p '`dirname "__DESTROOT__$NGX_HTTP_LOG_PATH"`'
+
+- test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
++ test -d '__DESTROOT__$NGX_PREFIX/share/nginx/html' || \
++ mkdir -p '__DESTROOT__$NGX_PREFIX/share/nginx/html' && \
++ cp -r html '__DESTROOT__$NGX_PREFIX/share/nginx'
+ END
+
+
+-if test -n "$NGX_ERROR_LOG_PATH"; then
++if test -n "__DESTROOT__$NGX_ERROR_LOG_PATH"; then
+ cat << END >> $NGX_MAKEFILE
+
+- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
+- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
++ test -d '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`' || \
++ mkdir -p '`dirname "__DESTROOT__$NGX_ERROR_LOG_PATH"`'
+ END
+
+ fi
Deleted: trunk/dports/www/nginx/files/patch-conf__nginx.conf
===================================================================
--- trunk/dports/www/nginx/files/patch-conf__nginx.conf 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/www/nginx/files/patch-conf__nginx.conf 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,47 +0,0 @@
---- conf/nginx.conf 2007-05-12 07:19:58.000000000 +0000
-+++ conf/nginx.conf.new 2007-05-12 07:19:36.000000000 +0000
-@@ -15,7 +15,7 @@
-
-
- http {
-- include conf/mime.types;
-+ include etc/nginx/mime.types;
- default_type application/octet-stream;
-
- #log_format main '$remote_addr - $remote_user [$time_local] $request '
-@@ -41,7 +41,7 @@
- #access_log logs/host.access.log main;
-
- location / {
-- root html;
-+ root share/nginx/html;
- index index.html index.htm;
- }
-
-@@ -51,7 +51,7 @@
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
-- root html;
-+ root share/nginx/html;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -86,7 +86,7 @@
- # server_name somename alias another.alias;
-
- # location / {
-- # root html;
-+ # root share/nginx/html;
- # index index.html index.htm;
- # }
- #}
-@@ -109,7 +109,7 @@
- # ssl_prefer_server_ciphers on;
-
- # location / {
-- # root html;
-+ # root share/nginx/html;
- # index index.html index.htm;
- # }
- #}
Copied: trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff (from rev 31107, trunk/dports/www/nginx/files/patch-conf__nginx.conf)
===================================================================
--- trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff (rev 0)
+++ trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,47 @@
+--- conf/nginx.conf 2007-05-12 07:19:58.000000000 +0000
++++ conf/nginx.conf.new 2007-05-12 07:19:36.000000000 +0000
+@@ -15,7 +15,7 @@
+
+
+ http {
+- include conf/mime.types;
++ include etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ #log_format main '$remote_addr - $remote_user [$time_local] $request '
+@@ -41,7 +41,7 @@
+ #access_log logs/host.access.log main;
+
+ location / {
+- root html;
++ root share/nginx/html;
+ index index.html index.htm;
+ }
+
+@@ -51,7 +51,7 @@
+ #
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+- root html;
++ root share/nginx/html;
+ }
+
+ # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+@@ -86,7 +86,7 @@
+ # server_name somename alias another.alias;
+
+ # location / {
+- # root html;
++ # root share/nginx/html;
+ # index index.html index.htm;
+ # }
+ #}
+@@ -109,7 +109,7 @@
+ # ssl_prefer_server_ciphers on;
+
+ # location / {
+- # root html;
++ # root share/nginx/html;
+ # index index.html index.htm;
+ # }
+ #}
Modified: trunk/dports/x11/mrxvt/Portfile
===================================================================
--- trunk/dports/x11/mrxvt/Portfile 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/x11/mrxvt/Portfile 2007-11-19 00:42:41 UTC (rev 31242)
@@ -19,7 +19,7 @@
homepage http://materm.sourceforge.net/
master_sites sourceforge:materm
patch_sites ${master_sites}
-patchfiles patch-src__rxvt.h no-scroll-with-buffer-mrxvt-0.5.3.patch
+patchfiles patch-src__rxvt.h.diff no-scroll-with-buffer-mrxvt-0.5.3.patch.diff
checksums [suffix ${distname}] \
md5 0dac39bef63a4a69eab35c027e8c5bdf \
sha1 442006f1d797ea5464c5c49d26d0cdecf79160f4 \
Deleted: trunk/dports/x11/mrxvt/files/patch-src__rxvt.h
===================================================================
--- trunk/dports/x11/mrxvt/files/patch-src__rxvt.h 2007-11-19 00:07:04 UTC (rev 31241)
+++ trunk/dports/x11/mrxvt/files/patch-src__rxvt.h 2007-11-19 00:42:41 UTC (rev 31242)
@@ -1,22 +0,0 @@
---- src/rxvt.h 2006-10-01 21:50:38.000000000 +0000
-+++ src/rxvt.h.new 2007-06-14 22:59:53.000000000 +0000
-@@ -53,7 +53,6 @@
- # define ALL_NUMERIC_PTYS
- #endif
-
--
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -197,6 +196,11 @@
- # define ut_name ut_user
- #endif
-
-+/* Need this to get prototype for openpty(), at least on Mac OS X 10.4 */
-+#ifdef OS_DARWIN
-+# include <util.h>
-+#endif
-+
- #ifdef TTY_GID_SUPPORT
- # include <grp.h>
- #endif
Copied: trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff (from rev 31107, trunk/dports/x11/mrxvt/files/patch-src__rxvt.h)
===================================================================
--- trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff (rev 0)
+++ trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff 2007-11-19 00:42:41 UTC (rev 31242)
@@ -0,0 +1,22 @@
+--- src/rxvt.h 2006-10-01 21:50:38.000000000 +0000
++++ src/rxvt.h.new 2007-06-14 22:59:53.000000000 +0000
+@@ -53,7 +53,6 @@
+ # define ALL_NUMERIC_PTYS
+ #endif
+
+-
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+@@ -197,6 +196,11 @@
+ # define ut_name ut_user
+ #endif
+
++/* Need this to get prototype for openpty(), at least on Mac OS X 10.4 */
++#ifdef OS_DARWIN
++# include <util.h>
++#endif
++
+ #ifdef TTY_GID_SUPPORT
+ # include <grp.h>
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/ddea2345/attachment-0001.html
More information about the macports-changes
mailing list