From owner-freebsd-ports Sat Jan 30 20:10:06 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id UAA04611 for freebsd-ports-outgoing; Sat, 30 Jan 1999 20:10:06 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA04549 for ; Sat, 30 Jan 1999 20:10:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id UAA74531; Sat, 30 Jan 1999 20:10:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from rebel.net.au (rebel.rebel.net.au [203.20.69.66]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA03505 for ; Sat, 30 Jan 1999 20:01:27 -0800 (PST) (envelope-from kkenn@rebel.net.au) Received: from 203.20.69.72 (dialup-2.rebel.net.au [203.20.69.72]) by rebel.net.au (8.8.5/8.8.4) with ESMTP id OAA05840 for ; Sun, 31 Jan 1999 14:31:22 +1030 Received: (qmail 73942 invoked by uid 1000); 31 Jan 1999 04:00:44 -0000 Message-Id: <19990131040044.73941.qmail@morden.rebel.net.au> Date: 31 Jan 1999 04:00:44 -0000 From: kkenn@rebel.net.au Reply-To: kkennawa@physics.adelaide.edu.au To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9832: net/xwhois port tries to assume gtk-1.0 dependency Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9832 >Category: ports >Synopsis: net/xwhois port tries to assume gtk-1.0 dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Jan 30 20:10:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Kris Kennaway >Release: FreeBSD-4.0 >Organization: FreeBSD >Environment: >Description: The xwhois port has a LIB_DEPENDS on gtk11, but uses the gtk-config script of gtk-1.0 at build-time. I dunno how this managed to get through - it was overlooked in my original port submission (the submission by another person used an explicit gtk10 dependency, but I didn't think this was needed since gtk11 is where it's at today and most ports use that where they can). Looks like the committed version lost one other of my patches, which told the makefile where the share directory was to live (under ${PREFIX}, not ${prefix} which was set in the Makefile to /usr/local) The port seems to build and work as advertised now :-) >How-To-Repeat: 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 Sun Jan 31 14:04:54 1999 @@ -1,40 +1,71 @@ ---- 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 +*** Makefile.orig Mon Dec 28 02:26:42 1998 +--- Makefile Sun Jan 31 14:04:44 1999 +*************** +*** 1,11 **** + # Xwhois Makefile + + prefix = /usr/local +! XWHOIS_SERVERS = $(prefix)/lib/xwhois/xwhois.servers + + # - Standard - + CC = gcc +! CFLAGS = -Wall -g -O2 + OBJECTS = xwhois.c + DEFINES = -DSTD -DHAVE_SNPRINTF + DEFINES += -DXWHOIS_SERVERS=\"$(XWHOIS_SERVERS)\" +--- 1,12 ---- + # Xwhois Makefile + + prefix = /usr/local +! XWHOIS_SERVERS = $(prefix)/share/xwhois/xwhois.servers + + # - Standard - + CC = gcc +! CFLAGS ?= -O2 +! CFLAGS += -Wall -g + OBJECTS = xwhois.c + DEFINES = -DSTD -DHAVE_SNPRINTF + DEFINES += -DXWHOIS_SERVERS=\"$(XWHOIS_SERVERS)\" +*************** +*** 26,45 **** + all: xwhois + + xwhois: $(OBJECTS) +! $(CC) $(CFLAGS) $(OBJECTS) $(DEFINES) -o xwhois `gtk-config --cflags` `gtk-config --libs` + + install: + 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 + + clean: + rm -f xwhois +--- 27,46 ---- + all: xwhois + + xwhois: $(OBJECTS) +! $(CC) $(CFLAGS) $(OBJECTS) $(DEFINES) -o xwhois `gtk11-config --cflags` `gtk11-config --libs` + + install: + 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/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 >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message