aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorleeym <leeym@FreeBSD.org>2004-05-30 07:14:31 +0800
committerleeym <leeym@FreeBSD.org>2004-05-30 07:14:31 +0800
commit94c710d77b0f2e78e8d44c9ab148dcd7d3a65ad1 (patch)
tree35d0c1fa41b95a999e33fff81fa4751ac625916b /net
parent2e80c69e336f2f67db367cb111aa025840b59dab (diff)
downloadfreebsd-ports-gnome-94c710d77b0f2e78e8d44c9ab148dcd7d3a65ad1.tar.gz
freebsd-ports-gnome-94c710d77b0f2e78e8d44c9ab148dcd7d3a65ad1.tar.zst
freebsd-ports-gnome-94c710d77b0f2e78e8d44c9ab148dcd7d3a65ad1.zip
update to GeoIP-1.3.1, so version bumped to 4.
install default configuration file PR: 62900 Submitted by: Ying-Chieh Liao <ijliao@FreeBSD.csie.NCTU.edu.tw> Approved by: maintainer timeout
Diffstat (limited to 'net')
-rw-r--r--net/GeoIP/Makefile6
-rw-r--r--net/GeoIP/distinfo3
-rw-r--r--net/GeoIP/files/patch-ltmain.sh15
-rw-r--r--net/GeoIP/pkg-message4
-rw-r--r--net/GeoIP/pkg-plist6
5 files changed, 23 insertions, 11 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 40924cbcae1f..7660e2e44a65 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= GeoIP
-PORTVERSION= 1.2.2
+PORTVERSION= 1.3.1
CATEGORIES= net
MASTER_SITES= http://www.maxmind.com/download/geoip/api/c/
@@ -20,6 +20,8 @@ INSTALLS_SHLIB= yes
MAN1= geoiplookup.1 geoipupdate.1
post-install:
- @${CAT} ${PKGMESSAGE}
+.if !exists(${PREFIX}/etc/GeoIP.conf.default)
+ @${CP} ${PREFIX}/etc/GeoIP.conf.default ${PREFIX}/etc/GeoIP.conf
+.endif
.include <bsd.port.mk>
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index bcd3ddf2cfb0..e14139183763 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,2 +1,3 @@
-MD5 (GeoIP-1.2.2.tar.gz) = 6844bee99c6426924a11b1998460e6f6
+MD5 (GeoIP-1.3.1.tar.gz) = cbfb7be70e2b02140677008d6e902dac
+SIZE (GeoIP-1.3.1.tar.gz) = 526429
SIZE (GeoIP-1.2.2.tar.gz) = 512557
diff --git a/net/GeoIP/files/patch-ltmain.sh b/net/GeoIP/files/patch-ltmain.sh
new file mode 100644
index 000000000000..ed86eb157e27
--- /dev/null
+++ b/net/GeoIP/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig Mon Feb 16 14:36:27 2004
++++ ltmain.sh Mon Feb 16 14:36:37 2004
+@@ -4175,10 +4175,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false ; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/GeoIP/pkg-message b/net/GeoIP/pkg-message
deleted file mode 100644
index 81d8cc2f4436..000000000000
--- a/net/GeoIP/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-***
-*** Please do this after you've ran the installation:
-*** - Copy ${PREFIX}/etc/GeoIP.conf.default to ${PREFIX}/etc/GeoIP.conf
-***
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index f1f3442c7e35..2b15652d4acd 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -2,21 +2,19 @@ bin/geoipexport
bin/geoipexportlocations
bin/geoiplookup
bin/geoipupdate
+@unexec if cmp -s %D/etc/GeoIP.conf %D/etc/GeoIP.conf.default; then rm -f %D/etc/GeoIP.conf; fi
etc/GeoIP.conf.default
include/GeoIP.h
include/GeoIPBitReader.h
include/GeoIPCity.h
include/GeoIPUpdate.h
lib/libGeoIP.a
-lib/libGeoIP.la
lib/libGeoIP.so
-lib/libGeoIP.so.3
+lib/libGeoIP.so.4
lib/libGeoIPBitReader.a
-lib/libGeoIPBitReader.la
lib/libGeoIPBitReader.so
lib/libGeoIPBitReader.so.0
lib/libGeoIPUpdate.a
-lib/libGeoIPUpdate.la
lib/libGeoIPUpdate.so
lib/libGeoIPUpdate.so.0
share/GeoIP/GeoIP.dat