Attachment #9810 for bug #19930

View | Details | Raw Unified | Return to bug 19930
Collapse All | Expand All

Lines 15-24 Link Here

(-)security/gtkportscan/Makefile (-4 / +3 lines)
15		15
16	LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	16	LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
17		17
18	WRKSRC= ${WRKDIR}/gtkportscan	18	GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
19		19
20	do-install:	20	WRKSRC= ${WRKDIR}/${PORTNAME}
21	${INSTALL_PROGRAM} ${WRKSRC}/gtkportscan ${PREFIX}/bin	21	MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
22	${INSTALL_PROGRAM} ${WRKSRC}/portscan ${PREFIX}/bin
23		22
24	.include <bsd.port.mk>	23	.include <bsd.port.mk>




--- 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=`$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` 
 
 all: gtkportscan portscan
 
 portscan: portscan.c
-	$(CC) -O2 -Wall portscan.c -o portscan -g
+	$(CC) $(CFLAGS) portscan.c -o portscan
 
 gtkportscan: gtkportscan.c
-	$(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan -g
+	$(CC) $(CFLAGS) $(GTK_FLAGS) gtkportscan.c -o gtkportscan
 
 install:
-	cp portscan /usr/local/bin

Return to bug 19930

Lines 1-20 Link Here

(-)security/gtkportscan/patches/patch-aa (-5 / +5 lines)
1	--- Makefile.orig Thu Mar 11 01:58:41 1999	1	--- Makefile.orig Thu Mar 11 18:58:41 1999
2	+++ Makefile Sun Sep 12 20:59:30 1999	2	+++ Makefile Tue Jul 11 04:17:19 2000
3	@@ -1,21 +1,21 @@	3	@@ -1,21 +1,21 @@
4	-CC=gcc	4	-CC=gcc
5	-GTK_FLAGS=`gtk-config --cflags` `gtk-config --libs`	5	-GTK_FLAGS=`gtk-config --cflags` `gtk-config --libs`
6	+CC?=gcc	6	+CC?=gcc
7	+GTK_FLAGS=`gtk12-config --cflags` `gtk12-config --libs`	7	+GTK_FLAGS=`$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs`
8		8
9	all: gtkportscan portscan	9	all: gtkportscan portscan
10		10
11	portscan: portscan.c	11	portscan: portscan.c
12	- $(CC) -O2 -Wall portscan.c -o portscan -g	12	- $(CC) -O2 -Wall portscan.c -o portscan -g
13	+ $(CC) $(CFLAgS) -Wall portscan.c -o portscan ${CFLAGS}	13	+ $(CC) $(CFLAGS) portscan.c -o portscan
14		14
15	gtkportscan: gtkportscan.c	15	gtkportscan: gtkportscan.c
16	- $(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan -g	16	- $(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan -g
17	+ $(CC) -Wall $(GTK_FLAGS) gtkportscan.c -o gtkportscan ${CFLAGS}	17	+ $(CC) $(CFLAGS) $(GTK_FLAGS) gtkportscan.c -o gtkportscan
18		18
19	install:	19	install:
20	- cp portscan /usr/local/bin	20	- cp portscan /usr/local/bin