ports/76753: [ patch ] x11-wm/fluxbox-devel: utilize OPTIONS, some new knobs, portlint

[Roman Bogorodskiy]

>Number:         76753
>Category:       ports
>Synopsis:       [ patch ] x11-wm/fluxbox-devel: utilize OPTIONS, some new knobs, portlint
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 27 14:30:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #3: Sat Dec 11 21:01:26 MSK 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386


>Description:
	- x11-wm/fluxbox-devel has lots of build options now,
          so I think OPTIONS utilization will be useful
        - add XRENDER and REMEMBER knobs
        - replace DISTFILES with DISTNAME to avoid portlint warning
        - bump PORTREVISION
>How-To-Repeat:
>Fix:

--- port.fluxbox-devel.diff begins here ---
diff -ru fluxbox-devel.orig/Makefile fluxbox-devel/Makefile
--- fluxbox-devel.orig/Makefile	Wed Jan 26 18:30:00 2005
+++ fluxbox-devel/Makefile	Thu Jan 27 17:22:27 2005
@@ -7,11 +7,12 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
 PKGNAMESUFFIX=	-devel
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mezz at FreeBSD.org
@@ -32,6 +33,20 @@
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 MAN1=		fbrun.1 fbsetbg.1 fluxbox.1 fluxstyle.1 startfluxbox.1
 
+OPTIONS=	DEBUG "Build with debugging symbols" off \
+		DOCHTML "HTML documentation" off \
+		DOCPDF "PDF documentation" off \
+		IMLIB2 "Imlib2 (pixmap themes) support" on \
+		KDE "KDE slit support" off \
+		NLS "NLS support" on \
+		REMEMBER "Remembering attributes support" on \
+		SLIT "Slit support" on \
+		TOOLBAR "Toolbar support" on \
+		XINERAMA "Xinerama support" on \
+		XRENDER "Xrender (transparent) support" on
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -70,7 +85,13 @@
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if defined(WITHOUT_XRENDER)
+CONFIGURE_ARGS+=	--disable-xrender
+.else
+CONFIGURE_ARGS+=	--enable-xrender
+.endif
+
+.if defined(WITH_NLS)
 USE_GETTEXT=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib -liconv"
@@ -83,59 +104,28 @@
 PLIST_SUB+=		NLS:="@comment "
 .endif
 
-.if !defined(WITHOUT_SLIT)
+.if defined(WITH_REMEMBER)
+CONFIGURE_ARGS+=	--enable-remember
+.else
+CONFIGURE_ARGS+=	--disable-remember
+.endif
+
+.if defined(WITH_SLIT)
 CONFIGURE_ARGS+=	--enable-slit
 .else
 CONFIGURE_ARGS+=	--disable-slit
 .endif
 
-.if !defined(WITHOUT_TOOLBAR)
+.if defined(WITH_TOOLBAR)
 CONFIGURE_ARGS+=	--enable-toolbar
 .else
 CONFIGURE_ARGS+=	--disable-toolbar
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-.endif
-
-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_DOCHTML)
-	@${ECHO_CMD} "WITH_DOCHTML=yes	Install the HTML documentation"
-.endif
-.if !defined(WITH_DOCPDF)
-	@${ECHO_CMD} "WITH_DOCPDF=yes		Install the PDF documentation"
-.endif
-.if !defined(WITH_GNOME)
-	@${ECHO_CMD} "WITH_GNOME=yes		Enable GNOME support"
-.endif
-.if !defined(WITH_IMLIB2)
-	@${ECHO_CMD} "WITH_IMLIB2=yes		Enable Imlib2 (pixmap themes) support"
-.endif
-.if !defined(WITH_KDE)
-	@${ECHO_CMD} "WITH_KDE=yes		Enable KDE slit support"
-.endif
-.if !defined(WITH_XINERAMA)
-	@${ECHO_CMD} "WITH_XINERAMA=yes	Enable Xinerama support"
-.endif
-.if !defined(WITHOUT_NLS)
-	@${ECHO_CMD} "WITHOUT_NLS=yes		Disable NLS support"
-.endif
-.if !defined(WITHOUT_SLIT)
-	@${ECHO_CMD} "WITHOUT_SLIT=yes	Disable slit"
-.endif
-.if !defined(WITHOUT_TOOLBAR)
-	@${ECHO_CMD} "WITHOUT_TOOLBAR=yes	Disable toolbar"
 .endif
 
 post-patch:
--- port.fluxbox-devel.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: