1 files changed, 47 insertions, 22 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 931fba4a694d..4cfa818bafdd 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,41 +6,61 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	mezz7@cox.net
+PATCH_SITES=	http://fluxbox.org/download/
+PATCHFILES=	fluxbox-0.9.9-gcc3.4.patch
+
+MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A small and fast window manager based on BlackBox
 
+BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
-BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 
 CONFLICTS=	fluxbox-0.1.*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=		--enable-nls
+GNU_CONFIGURE=	yes
 
-.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--enable-kde
+MAN1=		fbrun.1 fbsetbg.1 fluxbox.1 fluxstyle.1 startfluxbox.1
+
+NLSMAKEFILES=	nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \
+		nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pl_PL \
+		nls/pt_BR nls/pt_PT nls/ru_RU nls/sl_SI nls/sv_SE nls/tr_TR
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-kde
+.else
+CONFIGURE_ARGS+=	--disable-kde
+.endif
 
-MAN1=		fluxbox.1
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB=		NLS:=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=		NLS:="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
@@ -48,31 +68,36 @@ CONFIGURE_ARGS+=	--enable-gnome
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
-NLSMAKEFILES=	nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \
-			nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pt_BR \
-			nls/pt_PT nls/ru_RU nls/sv_SE nls/tr_TR
-
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Definable build options"
 	@${ECHO_CMD} "-----------------------"
+.if !defined(WITH_DEBUG)
+	@${ECHO_CMD} "WITH_DEBUG=yes		Build with debugging symbols"
+.endif
 .if !defined(WITH_XINERAMA)
-	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
+	@${ECHO_CMD} "WITH_XINERAMA=yes	Enable Xinerama support"
 .endif
 .if !defined(WITH_KDE)
-	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
+	@${ECHO_CMD} "WITH_KDE=yes		Enable KDE slit support"
+.endif
+.if !defined(WITH_GNOME)
+	@${ECHO_CMD} "WITH_GNOME=yes		Enable GNOME support"
+.endif
+.if !defined(WITHOUT_NLS)
+	@${ECHO_CMD} "WITH_NLS=yes		Enable NLS support"
 .endif
 
-post-patch::
+post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/util/fluxbox-generate_menu.in
-
-post-configure::
+.if !defined(WITHOUT_NLS)
 .for i in ${NLSMAKEFILES}
-	@${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile
+	@${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile.in
 .endfor
+.endif
 
-post-install::
+post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>