From pat@cc92687-a.wlgrv1.pa.home.com  Fri Sep 14 14:06:16 2001
Return-Path: <pat@cc92687-a.wlgrv1.pa.home.com>
Received: from cc92687-a.wlgrv1.pa.home.com (cc92687-a.wlgrv1.pa.home.com [24.5.63.190])
	by hub.freebsd.org (Postfix) with ESMTP id CBC3337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2001 14:06:14 -0700 (PDT)
Received: (from root@localhost)
	by cc92687-a.wlgrv1.pa.home.com (8.11.6/8.11.5) id f8EL6DV39965;
	Fri, 14 Sep 2001 17:06:13 -0400 (EDT)
	(envelope-from pat)
Message-Id: <200109142106.f8EL6DV39965@cc92687-a.wlgrv1.pa.home.com>
Date: Fri, 14 Sep 2001 17:06:13 -0400 (EDT)
From: Patrick Li <pat@databits.net>
Reply-To: Patrick Li <pat@databits.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: security/qtfw
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         30578
>Category:       ports
>Synopsis:       Update port: security/qtfw
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 14 14:10:00 PDT 2001
>Closed-Date:    Fri Sep 14 21:47:36 PDT 2001
>Last-Modified:  Fri Sep 14 21:47:49 PDT 2001
>Originator:     Patrick Li
>Release:        FreeBSD 4.4-RC i386
>Organization:
N/A
>Environment:
System: FreeBSD bottlenek 4.4-RC FreeBSD 4.4-RC #0: Sat Sep 8 19:47:38 EDT 2001 root@bottlenek:/usr/src/sys/compile/BOTTLENEK i386
>Description:
- Update to 0.4
- Install data and docs
- Take out optimization flags
- Remove patch-Makefile
>How-To-Repeat:
N/A
>Fix:
diff -ruN /usr/ports/security/qtfw/Makefile qtfw/Makefile
--- /usr/ports/security/qtfw/Makefile	Wed Aug 29 07:29:30 2001
+++ qtfw/Makefile	Fri Sep 14 16:42:29 2001
@@ -6,18 +6,34 @@
 #
 
 PORTNAME=	qtfw
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	pat@databits.net
 
-ALL_TARGET=	${PORTNAME}
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_QT_VER=	2
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}"
 
-post-install:
+pre-patch:
+	@${PERL} -pi.orig -e 's|^\ *CXXFLAGS=.*||' \
+		${WRKSRC}/configure
+	@${PERL} -pi.orig -e 's|\-O2||' ${WRKSRC}/qtfw/Makefile.in
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/qtfw/qtfw ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+.for files in gear qtfwlogo
+	@${INSTALL_DATA} ${WRKSRC}/pics/${files}.png ${DATADIR}
+.endfor
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for docs in index.html ipfwman.html qtfwlogo.jpeg
+	@${INSTALL_DATA} ${WRKSRC}/docs/${docs} ${DOCSDIR}
+.endfor
 	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/examples/* \
 		${PREFIX}/share/examples/${PORTNAME}
diff -ruN /usr/ports/security/qtfw/distinfo qtfw/distinfo
--- /usr/ports/security/qtfw/distinfo	Wed Aug 29 07:29:30 2001
+++ qtfw/distinfo	Fri Sep 14 15:49:38 2001
@@ -1 +1 @@
-MD5 (qtfw-0.3.1.tar.gz) = 6860180726c24deea67218a34d83c7a8
+MD5 (qtfw-0.4.tar.gz) = f366a3f9bbc05fc6f103465228d70566
diff -ruN /usr/ports/security/qtfw/files/patch-Makefile qtfw/files/patch-Makefile
--- /usr/ports/security/qtfw/files/patch-Makefile	Wed Aug 29 07:29:30 2001
+++ qtfw/files/patch-Makefile	Wed Dec 31 19:00:00 1969
@@ -1,39 +0,0 @@
---- Makefile.orig	Fri Aug 24 12:17:26 2001
-+++ Makefile	Sat Aug 25 10:49:38 2001
-@@ -7,18 +7,18 @@
- aboutdlg.cpp moc_aboutdlg.cpp
- OBJS=$(SOURCES:.cpp=.o)
- 
--CFLAGS=-g -Wall -I/usr/X11R6/include/qt2
--LDFLAGS=-L/usr/X11R6/lib -lqt2
-+CFLAGS=-g -Wall -I${X11BASE}/include/qt2
-+LDFLAGS=-L${X11BASE}/lib -lqt2
- 
--INSTALL_PREFIX=/usr/X11R6
-+INSTALL_PREFIX=${PREFIX}
- HTMLS:=`echo docs/*.html`
- EXAMPLES:=`echo examples/*.html`
- 
- $(TARGET):$(OBJS)
--	g++ $(LDFLAGS) -o $(TARGET) $(OBJS)
-+	${CXX} $(LDFLAGS) -o $(TARGET) $(OBJS)
- 
- .cpp.o:
--	g++ $(CFLAGS) -c $<
-+	${CXX} $(CFLAGS) -c $<
- 
- moc_mainformbase.cpp : mainformbase.H
- 	moc2 mainformbase.H > moc_mainformbase.cpp
-@@ -57,11 +57,7 @@
- 	rm -f moc_*
- 
- install: $(TARGET)
--	install -c $(TARGET) $(INSTALL_PREFIX)/bin/
--	install -d $(INSTALL_PREFIX)/share/$(TARGET)/docs/
--	install -d $(INSTALL_PREFIX)/share/$(TARGET)/examples/
--	cp -R docs/ $(INSTALL_PREFIX)/share/$(TARGET)/docs/
--	cp -R examples/ $(INSTALL_PREFIX)/share/$(TARGET)/examples/
-+	${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_PREFIX)/bin
- 	
- uninstall:
- 	rm -f $(INSTALL_PREFIX)/bin/$(TARGET)
diff -ruN /usr/ports/security/qtfw/pkg-plist qtfw/pkg-plist
--- /usr/ports/security/qtfw/pkg-plist	Wed Aug 29 07:29:30 2001
+++ qtfw/pkg-plist	Fri Sep 14 16:44:04 2001
@@ -1,4 +1,11 @@
 bin/qtfw
+%%PORTDOCS%%share/doc/qtfw/index.html
+%%PORTDOCS%%share/doc/qtfw/ipfwman.html
+%%PORTDOCS%%share/doc/qtfw/qtfwlogo.jpeg
 %%PORTDOCS%%share/examples/qtfw/base.rules
 %%PORTDOCS%%share/examples/qtfw/client.rules
+share/qtfw/gear.png
+share/qtfw/qtfwlogo.png
+@dirrm share/qtfw
 %%PORTDOCS%%@dirrm share/examples/qtfw
+%%PORTDOCS%%@dirrm share/doc/qtfw
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Fri Sep 14 21:47:36 PDT 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=30578 
>Unformatted:
