5 files changed, 39 insertions, 89 deletions

diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index 817183e05e1e..954c4d0c86d3 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -6,37 +6,20 @@
 #
 
 PORTNAME=	qtfw
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	pat@FreeBSD.org
 
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 USE_GMAKE=	yes
-USE_QT_VER=	2
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}" X11BASE="${X11BASE}"
-
-pre-patch:
-	@${PERL} -pi.orig -e 's|^\ *CXXFLAGS=.*||' \
-		${WRKSRC}/configure
-	@${PERL} -pi.orig -e 's|\-O2||' ${WRKSRC}/qtfw/Makefile.in
+USE_QT_VER=	3
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 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}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/qtfw ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/qtfw/distinfo b/security/qtfw/distinfo
index a06f18095f5c..3900cb346d0b 100644
--- a/security/qtfw/distinfo
+++ b/security/qtfw/distinfo
@@ -1 +1 @@
-MD5 (qtfw-0.4.tar.gz) = f366a3f9bbc05fc6f103465228d70566
+MD5 (qtfw-0.5.tar.gz) = 37f016c37d11caef19f97b1b74ebde79
diff --git a/security/qtfw/files/patch-Makefile b/security/qtfw/files/patch-Makefile
new file mode 100644
index 000000000000..efe4966222e2
--- /dev/null
+++ b/security/qtfw/files/patch-Makefile
@@ -0,0 +1,32 @@
+--- Makefile.orig	Fri Sep 20 04:42:41 2002
++++ Makefile	Sat Sep 21 01:08:11 2002
+@@ -1,16 +1,14 @@
+ TARGET:=qtfw
+-prefix=/usr/local
+ INSTALL=install
+-CXX:=g++
+ MOC:=moc
+ UIC:=uic
+ RM:=rm -f
+ AWK=awk
+ LDFLAGS=
+-CFLAGS=-O -I. -I.. -Wall
+-QT_INCLUDES:=-I/usr/X11R6/include
+-QT_LIBS:=-L/usr/X11R6/lib
+-LIBS:=-lqt-mt -pthread
++CXXFLAGS+=-I. -I.. -Wall ${PTHREAD_CFLAGS}
++QT_INCLUDES:=-I${X11BASE}/include
++QT_LIBS:=-L${X11BASE}/lib
++LIBS:=-lqt-mt ${PTHREAD_LIBS}
+ 
+ UI_TEMPLATES_DIR:=../qtdesigner-ui
+ UI_TEMPLATES=$(wildcard $(UI_TEMPLATES_DIR)/*.ui)
+@@ -32,7 +30,7 @@
+ $(TARGET) :$(UI_HEADERS) $(UI_SOURCES)  $(OBJECTS)
+ 	$(CXX) $(LDFLAGS) $(QT_LIBS) $(LIBS) $(OBJECTS) -o $@
+ %.o : %.cpp
+-	$(CXX) $(CFLAGS) $(QT_INCLUDES) -c $<
++	$(CXX) $(CXXFLAGS) $(QT_INCLUDES) -c $<
+ $(UI_HEADERS) : %.H : $(UI_TEMPLATES_DIR)/%.ui
+ 	$(UIC) -o $@ $<
+ $(UI_SOURCES) : %.cpp : %.H $(UI_TEMPLATES_DIR)/%.ui
diff --git a/security/qtfw/files/patch-configure b/security/qtfw/files/patch-configure
deleted file mode 100644
index bbf01b8b0198..000000000000
--- a/security/qtfw/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig	Tue Apr  9 22:35:07 2002
-+++ configure	Tue Apr  9 22:35:17 2002
-@@ -790,7 +790,7 @@
- QT_LIB_DIR=NO
- 
- i_dir=NO
--for i in /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/local/qt2/include /usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/X11R6/include/qt2;
-+for i in ${X11BASE}/include/qt2;
- do
-   for j in qapplication.h;
-   do
-@@ -803,9 +803,9 @@
- 
- 
- l_dir=NO
--for i in /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/local/qt2/lib;
-+for i in ${X11BASE}/lib;
- do
--  for j in libqt.so libqt2.so;
-+  for j in libqt2.so;
-   do
-     if test -r "$i/$j"; then
-       l_dir=$i
-@@ -814,7 +814,7 @@
-   done
- done
- 
--for i in qt qt2;
-+for i in qt2;
- do
- 	
- 
-@@ -850,22 +850,6 @@
- for base_dir in /usr/X11R6 /usr/local /usr;do
- 	l_dir=`find $base_dir -name "libqt*.so"|$AWK -F "/" '{gsub($NF,"");print}'|head -n 1`
- 	i_dir=`find $base_dir -name "qapplication.h"|$AWK -F "/" '{gsub($NF,"");print}'|head -n 1`
--	
--
--echo '#include <qglobal.h>' >libtestprg.cpp
--echo 'int main(){qVersion();return 0;}' >>libtestprg.cpp
--if $CXX -o libtestprg.out libtestprg.cpp -I$i_dir -L$l_dir -lqt 2>/dev/null
--then
--	rm -r libtestprg.*
--	LIB_QT=qt
--	QT_INCLUDE_DIR=$i_dir
--	QT_LIB_DIR=$l_dir
--	echo "$ac_t""link with: $LIB_QT  includes: $QT_INCLUDE_DIR  libs: $QT_LIB_DIR" 1>&6;break 1
--else
--	rm -r libtestprg.*
--	
--fi
--
- 	
- 
- echo '#include <qglobal.h>' >libtestprg.cpp
diff --git a/security/qtfw/pkg-plist b/security/qtfw/pkg-plist
index 8455b61f91d9..5eb24ab1f497 100644
--- a/security/qtfw/pkg-plist
+++ b/security/qtfw/pkg-plist
@@ -1,11 +1 @@
 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