Date: 11 Feb 1999 13:14:37 -0000 From: kkenn@rebel.net.au To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/10026: Upgrade net/xwhois to 0.3.2 (and unbreak) Message-ID: <19990211131437.55745.qmail@morden.rebel.net.au>
next in thread | raw e-mail | index | archive | help
>Number: 10026 >Category: ports >Synopsis: Upgrade net/xwhois to 0.3.2 (and unbreak) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 11 05:20:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Kris Kennaway >Release: FreeBSD-2.0 >Organization: FreeBSD >Environment: 4.0-CURRENT >Description: This upgrades net/xwhois to 0.3.2, and thereby unbreaks the port (the previous distfile disappeared or something). This should be committed before the 3.1 ports freeze unless there are major problems. >How-To-Repeat: >Fix: diff -ruN xwhois/Makefile xwhois~/Makefile --- xwhois/Makefile Sat Jan 30 10:14:22 1999 +++ xwhois~/Makefile Thu Feb 11 23:33:42 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: xwhois -# Version required: 0.2.9 +# Version required: 0.3.2 # Date created: 31 December 1998 # Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au> # # $Id: Makefile,v 1.1.1.1 1999/01/29 23:44:22 billf Exp $ # -DISTNAME= xwhois-0.2.9 +DISTNAME= xwhois-0.3.2 CATEGORIES= net MASTER_SITES= http://c64.org/~nr/ \ http://www.goatnet.ml.org/ \ @@ -19,17 +19,19 @@ LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 USE_X_PREFIX= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk11-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 -ruN xwhois/files/md5 xwhois~/files/md5 --- xwhois/files/md5 Sat Jan 30 10:14:22 1999 +++ xwhois~/files/md5 Wed Feb 10 20:22:21 1999 @@ -1 +1 @@ -MD5 (xwhois-0.2.9.tar.gz) = 64663f0662d34cddedc414b3641666eb +MD5 (xwhois-0.3.2.tar.gz) = d14643d0dc650663fb3cf29259b565c4 diff -ruN xwhois/patches/patch-aa xwhois~/patches/patch-aa --- xwhois/patches/patch-aa Sat Jan 30 10:14:22 1999 +++ xwhois~/patches/patch-aa Thu Feb 11 23:21:24 1999 @@ -1,40 +1,79 @@ ---- 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 +--- configure.orig Wed Feb 10 05:41:04 1999 ++++ configure Thu Feb 11 23:21:16 1999 +@@ -775,32 +775,32 @@ + 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 - clean: - rm -f xwhois +-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" +@@ -808,7 +808,7 @@ + echo "-------------------------------------------------" + exit 0 + else +-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 +@@ -865,13 +865,13 @@ + PACKAGE=xwhois + VERSION=0.3.2 + +-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)\"' + +@@ -1606,7 +1606,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%@host@%$host%g + s%@host_alias@%$host_alias%g + s%@host_cpu@%$host_cpu%g diff -ruN xwhois/pkg/PLIST xwhois~/pkg/PLIST --- xwhois/pkg/PLIST Sat Jan 30 10:14:22 1999 +++ xwhois~/pkg/PLIST Thu Feb 11 23:26:16 1999 @@ -2,6 +2,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990211131437.55745.qmail>