diff options
author | Kris Kennaway <kris@FreeBSD.org> | 1999-04-24 14:15:09 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 1999-04-24 14:15:09 +0000 |
commit | 8717f2ffac6c6aae8762082e426faec534226b32 (patch) | |
tree | 0be4e2e2e58beb9b594ac6acc6d80625196e41bf /net/xwhois | |
parent | Upgrade to v1.40. (diff) |
Upgrade to 0.34, remove dependency on gtk-1.1 in favour of 1.2
PR: 11158
Submitted by: cpiazza@home.net
Notes
Notes:
svn path=/head/; revision=18109
Diffstat (limited to 'net/xwhois')
-rw-r--r-- | net/xwhois/Makefile | 11 | ||||
-rw-r--r-- | net/xwhois/distinfo | 2 | ||||
-rw-r--r-- | net/xwhois/files/patch-aa | 91 | ||||
-rw-r--r-- | net/xwhois/pkg-plist | 1 |
4 files changed, 18 insertions, 87 deletions
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile index 8ebe261bb21d..247a96ae2087 100644 --- a/net/xwhois/Makefile +++ b/net/xwhois/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: xwhois -# Version required: 0.3.3 +# Version required: 0.3.4 # Date created: 31 December 1998 # Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au> # -# $Id: Makefile,v 1.2 1999/03/01 10:46:39 kris Exp $ +# $Id: Makefile,v 1.3 1999/03/01 10:51:39 kris Exp $ # -DISTNAME= xwhois-0.3.3 +DISTNAME= xwhois-0.3.4 CATEGORIES= net MASTER_SITES= http://c64.org/~nr/ \ http://www.goatnet.ml.org/ \ @@ -17,11 +17,11 @@ MASTER_SITES= http://c64.org/~nr/ \ MAINTAINER= kris@FreeBSD.ORG -LIB_DEPENDS= gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel +LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk11d-config +CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin @@ -33,7 +33,6 @@ do-install: ${MKDIR} ${PREFIX}/share/doc/xwhois ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xwhois ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${PREFIX}/share/doc/xwhois - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/xwhois ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xwhois .endif diff --git a/net/xwhois/distinfo b/net/xwhois/distinfo index c638f1094a65..75b1c91eaae5 100644 --- a/net/xwhois/distinfo +++ b/net/xwhois/distinfo @@ -1 +1 @@ -MD5 (xwhois-0.3.3.tar.gz) = f54e139c774666b941f161b72c38364b +MD5 (xwhois-0.3.4.tar.gz) = b8fb33ca41bccbfe418af251c8d4ac4f diff --git a/net/xwhois/files/patch-aa b/net/xwhois/files/patch-aa index 7f7e1bb3849a..b59328a5959f 100644 --- a/net/xwhois/files/patch-aa +++ b/net/xwhois/files/patch-aa @@ -1,44 +1,6 @@ ---- configure.orig Wed Feb 10 13:40:08 1999 -+++ configure Mon Mar 1 21:06:00 1999 -@@ -775,53 +775,55 @@ - set dummy gtk-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:778: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_GTKCONFIG'+set}'`\" = set"; then -+if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$GTKCONFIG"; then -- ac_cv_prog_GTKCONFIG="$GTKCONFIG" # Let the user override the test. -+ if test -n "$GTK_CONFIG"; then -+ ac_cv_prog_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- ac_cv_prog_GTKCONFIG="found" -+ ac_cv_prog_GTK_CONFIG="found" - break - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_GTKCONFIG" && ac_cv_prog_GTKCONFIG="missing" -+ test -z "$ac_cv_prog_GTK_CONFIG" && ac_cv_prog_GTK_CONFIG="missing" - fi - fi --GTKCONFIG="$ac_cv_prog_GTKCONFIG" --if test -n "$GTKCONFIG"; then -- echo "$ac_t""$GTKCONFIG" 1>&6 -+GTK_CONFIG="$ac_cv_prog_GTK_CONFIG" -+if test -n "$GTK_CONFIG"; then -+ echo "$ac_t""$GTK_CONFIG" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - --if test $GTKCONFIG = "missing"; then -+if test $GTK_CONFIG = "missing"; then +--- configure.orig Wed Mar 31 16:37:29 1999 ++++ configure Thu Apr 15 12:46:24 1999 +@@ -809,11 +809,13 @@ echo "configure: warning: cant find gtk-config" 1>&2 echo "-------------------------------------------------" echo " GTK+ doesnt seam to be installed on this system" @@ -49,50 +11,21 @@ echo "-------------------------------------------------" exit 0 else --GTK_PREFIX=`gtk-config --version|cut -b 1,2,3` -+GTK_PREFIX=`${GTK_CONFIG} --version|cut -b 1,2,3` - if test $GTK_PREFIX = "1.0"; then - GTK_TYPE='GTK_STABLE' - else --if test `gtk-config --version|cut -d. -f3` -lt 13; then -+if test `${GTK_CONFIG} --version|cut -d. -f3` -lt 13; then - echo "----------------------------------------------------" --echo " Your version of GTK+, `gtk-config --version` is to old for Xwhois." -+echo " Your version of GTK+, `${GTK_CONFIG} --version` is to old for Xwhois." - echo "----------------------------------------------------" - exit 0 - fi - GTK_TYPE='GTK_DEVEL' - fi - --echo "building xwhois for gtk+ version... `gtk-config --version`" -+echo "building xwhois for gtk+ version... `${GTK_CONFIG} --version`" - fi - - if test "$program_transform_name" = s,x,x,; then -@@ -878,13 +880,13 @@ - PACKAGE=xwhois - VERSION=0.3.3 - --XWHOIS_SERVERS='$(prefix)/lib/xwhois/xwhois.servers' -+XWHOIS_SERVERS='$(prefix)/share/xwhois/xwhois.servers' +-GTK_PREFIX=`gtk-config --version` ++GTK_PREFIX=`$GTK_CONFIG --version` + x=`echo $GTK_PREFIX|cut -d. -f1` + y=`echo $GTK_PREFIX|cut -d. -f2` + z=`echo $GTK_PREFIX|cut -d. -f3` +@@ -895,10 +897,10 @@ + XWHOIS_SERVERS='$(prefix)/share/xwhois/xwhois.servers' -INCLUDES="-I. `gtk-config --cflags`" -+INCLUDES="-I. `${GTK_CONFIG} --cflags`" ++INCLUDES="-I. `$GTK_CONFIG --cflags`" -LIBS=`gtk-config --libs` -+LIBS=`${GTK_CONFIG} --libs` ++LIBS=`$GTK_CONFIG --libs` DEFINES='-DSTD -DHAVE_SNPRINTF -DXWHOIS_SERVERS=\"$(XWHOIS_SERVERS)\" -D$(GTK_TYPE)' -@@ -1619,7 +1621,7 @@ - s%@AUTOHEADER@%$AUTOHEADER%g - s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g --s%@GTKCONFIG@%$GTKCONFIG%g -+s%@GTK_CONFIG@%$GTK_CONFIG%g - s%@GTK_TYPE@%$GTK_TYPE%g - s%@host@%$host%g - s%@host_alias@%$host_alias%g diff --git a/net/xwhois/pkg-plist b/net/xwhois/pkg-plist index a9221e366828..177d3fb9a601 100644 --- a/net/xwhois/pkg-plist +++ b/net/xwhois/pkg-plist @@ -3,7 +3,6 @@ share/xwhois/xwhois.servers share/xwhois/pixmaps/xwhois.xpm share/doc/xwhois/README share/doc/xwhois/TODO -share/doc/xwhois/COPYING share/doc/xwhois/ChangeLog @dirrm share/xwhois/pixmaps @dirrm share/xwhois |