diff options
author | seanc <seanc@FreeBSD.org> | 2002-09-28 03:45:02 +0800 |
---|---|---|
committer | seanc <seanc@FreeBSD.org> | 2002-09-28 03:45:02 +0800 |
commit | 53ef0ccddbf59dcb599e70fa6fa2b1af79c8cf7a (patch) | |
tree | 97ddcde0b867d6fee78b79d4b54d4180ee55b6e0 /net | |
parent | eb2367d02f3a51b9d78cce0ba51b7aee38418c95 (diff) | |
download | freebsd-ports-gnome-53ef0ccddbf59dcb599e70fa6fa2b1af79c8cf7a.tar.gz freebsd-ports-gnome-53ef0ccddbf59dcb599e70fa6fa2b1af79c8cf7a.tar.zst freebsd-ports-gnome-53ef0ccddbf59dcb599e70fa6fa2b1af79c8cf7a.zip |
Fix misc/GeoIP's hanging install target by cat'ing a real file (not stdin).
While I'm here, upgrade to 1.0.5.
Approved By: portmgr/knu (mentor)
Diffstat (limited to 'net')
-rw-r--r-- | net/GeoIP/Makefile | 5 | ||||
-rw-r--r-- | net/GeoIP/distinfo | 2 | ||||
-rw-r--r-- | net/GeoIP/files/patch-conf::Makefile.in | 20 |
3 files changed, 13 insertions, 14 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index f686bba41dd5..e3a9d087ab5a 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -6,8 +6,7 @@ # PORTNAME= GeoIP -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= misc MASTER_SITES= http://maxmind.com/download/geoip/api/c/ @@ -22,6 +21,6 @@ INSTALLS_SHLIB= yes MAN1= geoiplookup.1 geoipupdate.1 post-install: - @${CAT} ${PKGMESSAGES} + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo index 636c578016b0..11ab9fe706d0 100644 --- a/net/GeoIP/distinfo +++ b/net/GeoIP/distinfo @@ -1 +1 @@ -MD5 (GeoIP-1.0.4.tar.gz) = dde625b05c1f72ff31e1eead82fe56a4 +MD5 (GeoIP-1.0.5.tar.gz) = 2bfeaef9a4843107b2e3f3d6e1c44796 diff --git a/net/GeoIP/files/patch-conf::Makefile.in b/net/GeoIP/files/patch-conf::Makefile.in index 211fdeac2bd2..eb466dab6ee6 100644 --- a/net/GeoIP/files/patch-conf::Makefile.in +++ b/net/GeoIP/files/patch-conf::Makefile.in @@ -1,6 +1,6 @@ ---- conf/Makefile.in.orig Wed Aug 28 06:54:49 2002 -+++ conf/Makefile.in Mon Sep 23 09:37:14 2002 -@@ -204,12 +204,12 @@ +--- conf/Makefile.in.orig Fri Sep 27 12:21:01 2002 ++++ conf/Makefile.in Fri Sep 27 12:26:02 2002 +@@ -242,12 +242,12 @@ install-data-hook: install-sysconfDATA @@ -10,12 +10,12 @@ - echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ - $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi -+# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ -+# echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ -+# else \ -+# echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -+# $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -+# fi - ++ # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ ++ # echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ ++ # else \ ++ # echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ ++ # $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ ++ # fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |