Upgrade to 0.3.3

4 files changed, 111 insertions, 50 deletions

diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index 469f4410f236..bd590d3a049f 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   xwhois
-# Version required:    0.2.9
+# Version required:    0.3.3
 # Date created:        31 December 1998
 # Whom:                Kris Kennaway <kkennawa@physics.adelaide.edu.au>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/01/29 23:44:22 billf Exp $
 #
 
-DISTNAME=	xwhois-0.2.9
+DISTNAME=	xwhois-0.3.3
 CATEGORIES=	net
 MASTER_SITES=	http://c64.org/~nr/ \
 		http://www.goatnet.ml.org/ \
@@ -14,22 +14,24 @@ MASTER_SITES=	http://c64.org/~nr/ \
 		ftp://c64.org/pub/nr/xwhois/ \
 		ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/xwhois/
 
-MAINTAINER=	kkennawa@physics.adelaide.edu.au
+MAINTAINER=	kris@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
 
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
 
 do-install:
-
-	${INSTALL_PROGRAM} ${WRKSRC}/xwhois ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/xwhois
 	${MKDIR} ${PREFIX}/share/xwhois/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/xwhois.servers ${PREFIX}/share/xwhois
-	${INSTALL_DATA} ${WRKSRC}/xwhois.xpm ${PREFIX}/share/xwhois/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.servers ${PREFIX}/share/xwhois
+	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.xpm ${PREFIX}/share/xwhois/pixmaps
 .if !defined(NOPORTDOCS)
 	${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 9635cb4ca378..c638f1094a65 100644
--- a/net/xwhois/distinfo
+++ b/net/xwhois/distinfo
@@ -1 +1 @@
-MD5 (xwhois-0.2.9.tar.gz) = 64663f0662d34cddedc414b3641666eb
+MD5 (xwhois-0.3.3.tar.gz) = f54e139c774666b941f161b72c38364b
diff --git a/net/xwhois/files/patch-aa b/net/xwhois/files/patch-aa
index 319131ca573b..7f7e1bb3849a 100644
--- a/net/xwhois/files/patch-aa
+++ b/net/xwhois/files/patch-aa
@@ -1,40 +1,98 @@
---- Makefile.orig	Fri Jan 29 17:41:21 1999
-+++ Makefile	Fri Jan 29 18:10:44 1999
-@@ -1,11 +1,12 @@
- # Xwhois Makefile
- 
- prefix = /usr/local
--XWHOIS_SERVERS = $(prefix)/lib/xwhois/xwhois.servers
-+XWHOIS_SERVERS = $(prefix)/share/xwhois/xwhois.servers
- 
- # - Standard -
- CC	= gcc
--CFLAGS	= -Wall -g -O2
-+CFLAGS	?= -O2
-+CFLAGS	+= -Wall -g
- OBJECTS	= xwhois.c
- DEFINES	= -DSTD -DHAVE_SNPRINTF
- DEFINES	+= -DXWHOIS_SERVERS=\"$(XWHOIS_SERVERS)\"
-@@ -32,14 +33,14 @@
- 	install -s -m 755 xwhois $(prefix)/bin
- 	mkdir -p $(prefix)/share/apps/Network
- 	install -m 644 Xwhois.desktop $(prefix)/share/apps/Network
--	mkdir -p $(prefix)/share/pixmaps
--	install -m 644 xwhois.xpm $(prefix)/share/pixmaps
--	mkdir -p $(prefix)/lib/xwhois
--	install -m 644 xwhois.servers $(prefix)/lib/xwhois
--	mkdir -p $(prefix)/doc/xwhois
--	install -m 644 README $(prefix)/doc/xwhois
--	install -m 644 COPYING $(prefix)/doc/xwhois
--	install -m 644 ChangeLog $(prefix)/doc/xwhois
-+	mkdir -p $(prefix)/share/xwhois/pixmaps
-+	install -m 644 xwhois.xpm $(prefix)/share/xwhois/pixmaps
-+	mkdir -p $(prefix)/share/xwhois
-+	install -m 644 xwhois.servers $(prefix)/share/xwhois
-+	mkdir -p $(prefix)/share/doc/xwhois
-+	install -m 644 README $(prefix)/share/doc/xwhois
-+	install -m 644 COPYING $(prefix)/share/doc/xwhois
-+	install -m 644 ChangeLog $(prefix)/share/doc/xwhois
- 
- clean:
- 	rm -f xwhois
+--- 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
+ echo "configure: warning: cant find gtk-config" 1>&2
+ echo "-------------------------------------------------"
+ echo " GTK+ doesnt seam to be installed on this system"
+-echo " or maybe gtk-config isnt in your PATH"
++echo " or maybe gtk-config isnt in your PATH. Set"
++echo " GTK_CONFIG in your environment to point to the"
++echo " location of the file if it does exist."
+ 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'
+ 
+ 
+-INCLUDES="-I. `gtk-config --cflags`"
++INCLUDES="-I. `${GTK_CONFIG} --cflags`"
+ 
+ 
+-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 07fc50e66c6a..a9221e366828 100644
--- a/net/xwhois/pkg-plist
+++ b/net/xwhois/pkg-plist
@@ -2,6 +2,7 @@ bin/xwhois
 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