Update to 0.4

PR:		30578
Submitted by:	maintainer

security/qtfw/Makefile

@@ -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}

security/qtfw/distinfo

@@ -1 +1 @@
-MD5 (qtfw-0.3.1.tar.gz) = 6860180726c24deea67218a34d83c7a8
+MD5 (qtfw-0.4.tar.gz) = f366a3f9bbc05fc6f103465228d70566

security/qtfw/files/patch-Makefile

@@ -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)

security/qtfw/pkg-plist

@@ -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