diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-02-13 18:51:36 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-02-13 18:51:36 +0000 |
| commit | 8ed9d18d8f48e522eeb22e69c4031e1a9a52f088 (patch) | |
| tree | c485a37636427aedd282e58c07fcc69cda95ebc4 /security | |
| parent | 6e61f3a69939519d7b0d87a87ffde66b675a8ebb (diff) | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/amap/Makefile | 2 | ||||
| -rw-r--r-- | security/amap/distinfo | 4 | ||||
| -rw-r--r-- | security/amap/files/patch-amap.h | 6 | ||||
| -rw-r--r-- | security/amap/files/patch-configure | 26 |
4 files changed, 22 insertions, 16 deletions
diff --git a/security/amap/Makefile b/security/amap/Makefile index 1db54f97c262..f3cb18fdb5ca 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amap -PORTVERSION= 4.7 +PORTVERSION= 4.8 CATEGORIES= security MASTER_SITES= http://www.thc.org/releases/ diff --git a/security/amap/distinfo b/security/amap/distinfo index 46d9fe2d0526..ab1b3b3b6fbf 100644 --- a/security/amap/distinfo +++ b/security/amap/distinfo @@ -1,2 +1,2 @@ -MD5 (amap-4.7.tar.gz) = c2ce244321b0b7b5eb28fdc785452b9a -SIZE (amap-4.7.tar.gz) = 253217 +MD5 (amap-4.8.tar.gz) = db6f6aa06afc6aeea7c7e0c594c73b69 +SIZE (amap-4.8.tar.gz) = 258019 diff --git a/security/amap/files/patch-amap.h b/security/amap/files/patch-amap.h index 7d7f6f3cb299..8b65eff2c244 100644 --- a/security/amap/files/patch-amap.h +++ b/security/amap/files/patch-amap.h @@ -1,10 +1,10 @@ ---- amap.h.orig Sun Sep 14 11:25:16 2003 -+++ amap.h Sun Sep 14 11:25:29 2003 +--- amap.h.orig Tue Feb 1 20:07:14 2005 ++++ amap.h Sun Feb 13 14:28:05 2005 @@ -33,7 +33,7 @@ #endif #endif --#define AMAP_APPDEF_PATH AMAP_PREFIX"/bin" +-#define AMAP_APPDEF_PATH AMAP_PREFIX"/etc" +#define AMAP_APPDEF_PATH AMAP_PREFIX"/share/amap" #define AMAP_BUFSIZE 1024 // standard buffer size #define AMAP_BUFSIZE_BIG 65536 // big standard buffer size diff --git a/security/amap/files/patch-configure b/security/amap/files/patch-configure index 501ee229c747..bbc0fc2cae4a 100644 --- a/security/amap/files/patch-configure +++ b/security/amap/files/patch-configure @@ -1,27 +1,33 @@ ---- configure.orig Sun Sep 14 11:10:24 2003 -+++ configure Sun Sep 14 11:16:41 2003 -@@ -33,7 +33,9 @@ +--- configure.orig Fri Jan 7 14:37:18 2005 ++++ configure Sun Feb 13 14:34:25 2005 +@@ -33,7 +33,7 @@ echo echo "Checking for openssl ..." -for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \ -+# FreeBSD: Try port version of openssl first. LIBDIRS is irrelevant for us -+# Since we don't have /etc/ld.so.conf +for i in ${PREFIX}/lib $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \ /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \ - /*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib + /*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib . do -@@ -61,7 +63,8 @@ +@@ -61,7 +61,7 @@ fi done -for i in /usr/local/include /*ssl/include /usr/include \ -+# FreeBSD: Change to prefer installed port over base-system openssl. +for i in ${PREFIX}/include /usr/local/include /*ssl/include /usr/include \ - /opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include + /opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include . do if [ "X" = "X$SSL_IPATH" ]; then -@@ -152,7 +155,7 @@ +@@ -127,7 +127,7 @@ + XLIBPATHS="" + XIPATHS="" + +-SYS=`uname -o` ++SYS=`uname -o 2>/dev/null` + if [ "$SYS" = "Cygwin" ]; then + echo "Cygwin detected, enabling compability options ..." + XDEFINES="-DCYGWIN" +@@ -159,7 +159,7 @@ XLIBS="$XLIBS -lresolv" fi |