From owner-freebsd-ports  Fri Jul 14  9:50:50 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id BA7A137C9BE
	for <freebsd-ports@FreeBSD.org>; Fri, 14 Jul 2000 09:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id JAA95178;
	Fri, 14 Jul 2000 09:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DD63837C7F8; Fri, 14 Jul 2000 09:42:40 -0700 (PDT)
Message-Id: <20000714164240.DD63837C7F8@hub.freebsd.org>
Date: Fri, 14 Jul 2000 09:42:40 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/19930: Update port: security/gtkportscan
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         19930
>Category:       ports
>Synopsis:       Update port: security/gtkportscan
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 14 09:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Use GTK_CONFIG instead of hardcoded gtk12-config

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/security/gtkportscan/Makefile security/gtkportscan/Makefile
--- /usr/ports/security/gtkportscan/Makefile	Fri Jun 30 19:57:49 2000
+++ security/gtkportscan/Makefile	Tue Jul 11 04:17:37 2000
@@ -15,10 +15,9 @@
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-WRKSRC=		${WRKDIR}/gtkportscan
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gtkportscan ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/portscan ${PREFIX}/bin
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff -urN /usr/ports/security/gtkportscan/patches/patch-aa security/gtkportscan/patches/patch-aa
--- /usr/ports/security/gtkportscan/patches/patch-aa	Sat Sep 18 02:35:06 1999
+++ security/gtkportscan/patches/patch-aa	Tue Jul 11 04:17:27 2000
@@ -1,20 +1,20 @@
---- Makefile.orig	Thu Mar 11 01:58:41 1999
-+++ Makefile	Sun Sep 12 20:59:30 1999
+--- Makefile.orig	Thu Mar 11 18:58:41 1999
++++ Makefile	Tue Jul 11 04:17:19 2000
 @@ -1,21 +1,21 @@
 -CC=gcc
 -GTK_FLAGS=`gtk-config --cflags` `gtk-config  --libs` 
 +CC?=gcc
-+GTK_FLAGS=`gtk12-config --cflags` `gtk12-config  --libs` 
++GTK_FLAGS=`$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` 
  
  all: gtkportscan portscan
  
  portscan: portscan.c
 -	$(CC) -O2 -Wall portscan.c -o portscan -g
-+	$(CC) $(CFLAgS) -Wall portscan.c -o portscan ${CFLAGS}
++	$(CC) $(CFLAGS) portscan.c -o portscan
  
  gtkportscan: gtkportscan.c
 -	$(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan -g
-+	$(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan ${CFLAGS}
++	$(CC) $(CFLAGS) $(GTK_FLAGS) gtkportscan.c -o gtkportscan
  
  install:
 -	cp portscan /usr/local/bin


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message