Index: head/security/fwbuilder-devel/Makefile
===================================================================
--- head/security/fwbuilder-devel/Makefile	(revision 286033)
+++ head/security/fwbuilder-devel/Makefile	(revision 286034)
@@ -1,94 +1,93 @@
 # New ports collection makefile for:	fwbuilder
 # Date Created:				3 Feb 2001
 # Whom:					Roman Shterenzon <roman@xpert.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fwbuilder
 DISTVERSION=	5.0.1
 PORTVERSION=	${DISTVERSION}
 CATEGORIES=	security
-BUILD=		3585
-DEVEL=		yes
-.if defined(DEVEL) && ${DEVEL} == yes
-MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-5.0/build-${BUILD}/
+BUILD=		3588
 PKGNAMESUFFIX=	-devel
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-5.0/current_build/
 PORTVERSION=	${DISTVERSION}.b${BUILD}
 .else
 MASTER_SITES=	SF/${PORTNAME}/Current_Packages/${PORTVERSION}
-DISTVERSIONSUFFIX=	.${BUILD}
 .endif
+DISTVERSIONSUFFIX=	.${BUILD}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-.if defined(DEVEL) && ${DEVEL} == yes
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-[234].* \
 		libfwbuilder-[234].* libfwbuilder-devel-[234].*
 .else
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
-		libfwbuilder-[23].* libfwbuilder-devel-*
+		libfwbuilder-[234].* libfwbuilder-devel-*
 .endif
 LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib \
 		gui \
 		iconengines \
 		inputmethods \
 		linguist_build \
 		moc_build \
 		rcc_build \
 		qmake_build \
 		svg \
 		uic_build \
 		xml
 
 QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf aclocal libtool
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 MAN1=		fwbuilder.1 \
 		fwbedit.1 \
 		fwb_iosacl.1 \
 		fwb_ipt.1 \
 		fwb_ipf.1 \
 		fwb_ipfw.1 \
 		fwb_pix.1 \
 		fwb_pf.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800107
 MAKE_ENV+=	CCACHE_DISABLE=yes
 .endif
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/fwbuilder
 	@${ECHO} If you are upgrading from a previous version of fwbuilder,
 	@${ECHO} please make sure to backup your fwbuilder database files
 	@${ECHO} prior to invoking fwbuilder for the first time.
 
 .if defined(NOPORTDOCS)
 BROKEN=		NOPORTDOCS is incomplete in this port
 .endif
 .include <bsd.port.post.mk>

Property changes on: head/security/fwbuilder-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.83
\ No newline at end of property
+1.84
\ No newline at end of property
Index: head/security/fwbuilder-devel/distinfo
===================================================================
--- head/security/fwbuilder-devel/distinfo	(revision 286033)
+++ head/security/fwbuilder-devel/distinfo	(revision 286034)
@@ -1,2 +1,2 @@
-SHA256 (fwbuilder-5.0.1.3585.tar.gz) = 943ae0275039c88a3b58c5b66864b3f06c8d50810d458ac4723a3c9cd517f51c
-SIZE (fwbuilder-5.0.1.3585.tar.gz) = 6721102
+SHA256 (fwbuilder-5.0.1.3588.tar.gz) = 3218bd4f6501b269cdd001d142f5c1d02a166c31d335ce9921bcdc1fd3395e1e
+SIZE (fwbuilder-5.0.1.3588.tar.gz) = 6724074

Property changes on: head/security/fwbuilder-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property