ports/172423: [PATCH] www/cgiwrap: Converting port to new options framework

[Michael Gmelin]

>Number:         172423
>Category:       ports
>Synopsis:       [PATCH] www/cgiwrap: Converting port to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 07 04:20:15 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
The patch below converts the port to use the new options framework[1]
and converts the Makefile header to the new format[2].

The patch is to be applied using:

patch -p0 -E </path/to/patchfile

No attempts have been made to fix any potential issues the port might
have beyond this scope. I also didn't fix any indentation issues to
keep the patch small and easy to audit, a future port maintainer might
want to take care of this.

See also:
1. http://lists.freebsd.org/pipermail/freebsd-ports/2012-October/078676.html
2. http://lists.freebsd.org/pipermail/freebsd-ports/2012-August/077801.html

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- cgiwrap-4.1.patch begins here ---
diff -ruN --exclude=CVS ../cgiwrap.orig/Makefile ./Makefile
--- ../cgiwrap.orig/Makefile	2009-01-13 04:23:17.000000000 +0100
+++ ./Makefile	2012-10-07 06:01:01.395371894 +0200
@@ -1,31 +1,36 @@
-# New ports collection makefile for:    cgiwrap
-# Date created:         30 July 1998
-# Whom:                 Brent J. Nordquist <bjn at visi.com>
-#
-# $FreeBSD: ports/www/cgiwrap/Makefile,v 1.30 2009/01/13 03:23:17 wxs Exp $
-#
-
-PORTNAME=	cgiwrap
-PORTVERSION=	4.1
-CATEGORIES=	www security
-MASTER_SITES=	SF
-
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Securely execute Web CGI scripts
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-OPTIONS=	CGI_OWNER "Check CGI file owner" on \
-		CGI_GROUP "Check CGI file group" on \
-		CGI_SETUID "Check CGI file setuid permissions" on \
-		CGI_SETGID "Check CGI file setgid permissions" on \
-		CGI_GROUP_WRITABLE "Check CGI g+w file permissions" on \
-		CGI_WORLD_WRITABLE "Check CGI o+w file permissions" on \
-		USE_REDIRECT_URL "Use REDIRECT_URL to build SCRIPT_NAME" off \
-		USE_SCRIPT_URL "Use SCRIPT_URL to build SCRIPT_NAME" off \
-		NPH "Enable nph binaries" off \
-		DEBUG "Enable cgiwrapd binaries" off
+# Created by: Brent J. Nordquist <bjn at visi.com>
+# $FreeBSD: $
+
+PORTNAME=		cgiwrap
+PORTVERSION=		4.1
+CATEGORIES=		www security
+MASTER_SITES=		SF
+
+MAINTAINER=		ports at FreeBSD.org
+COMMENT=		Securely execute Web CGI scripts
+
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PKGMESSAGE=		${WRKDIR}/pkg-message
+
+OPTIONS_DEFINE=		CGI_OWNER CGI_GROUP CGI_SETUID CGI_SETGID \
+			CGI_GROUP_WRITABLE CGI_WORLD_WRITABLE DEBUG \
+			DOCS NPH USE_REDIRECT_URL USE_SCRIPT_URL
+OPTIONS_DEFAULT=	CGI_OWNER CGI_GROUP CGI_SETUID CGI_SETGID \
+			CGI_GROUP_WRITABLE CGI_WORLD_WRITABLE
+
+CGI_OWNER_DESC=		Check CGI file owner
+CGI_GROUP_DESC=		Check CGI file group
+CGI_SETUID_DESC=	Check CGI file setuid permissions
+CGI_SETGID_DESC=	Check CGI file setgid permissions
+CGI_GROUP_WRITABLE_DESC=Check CGI g+w file permissions
+CGI_WORLD_WRITABLE_DESC=Check CGI o+w file permissions
+USE_REDIRECT_URL_DESC=	Use REDIRECT_URL to build SCRIPT_NAME
+USE_SCRIPT_URL_DESC=	Use SCRIPT_URL to build SCRIPT_NAME
+NPH_DESC=		Enable nph binaries
+DEBUG_DESC=		Enable cgiwrapd binaries
+# Note: DEBUG_DESC has been overridden intentionally, since its meaning
+#       is slightly different from what a user would usually expect
+#       (but still close neough)
 
 ##
 # INSTALL_DIR
@@ -65,7 +70,7 @@
 		--with-check-shell \
 		--with-wall
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ##
 # LOG_FILE
@@ -78,46 +83,46 @@
 .else
 CONFIGURE_ARGS+=	--without-logging-file
 .endif
-.if !defined(WITH_CGI_OWNER)
+.if !${PORT_OPTIONS:MCGI_OWNER}
 CONFIGURE_ARGS+=	--without-check-owner
 .endif
-.if !defined(WITH_CGI_GROUP)
+.if !${PORT_OPTIONS:MCGI_GROUP}
 CONFIGURE_ARGS+=	--without-check-group
 .endif
-.if !defined(WITH_CGI_SETUID)
+.if !${PORT_OPTIONS:MCGI_SETUID}
 CONFIGURE_ARGS+=	--without-check-setuid
 .endif
-.if !defined(WITH_CGI_SETGID)
+.if !${PORT_OPTIONS:MCGI_SETGID}
 CONFIGURE_ARGS+=	--without-check-setgid
 .endif
-.if !defined(WITH_CGI_GROUP_WRITABLE)
+.if !${PORT_OPTIONS:MCGI_GROUP_WRITABLE}
 CONFIGURE_ARGS+=	--without-check-group-writable
 .endif
-.if !defined(WITH_CGI_WORLD_WRITABLE)
+.if !${PORT_OPTIONS:MCGI_WORLD_WRITABLE}
 CONFIGURE_ARGS+=	--without-check-world-writable
 .endif
-.if defined(WITH_USE_REDIRECT_URL)
+.if ${PORT_OPTIONS:MUSE_REDIRECT_URL}
 CONFIGURE_ARGS+=	--with-use-redirect-url
 .endif
-.if defined(WITH_USE_SCRIPT_URL)
+.if ${PORT_OPTIONS:MUSE_SCRIPT_URL}
 CONFIGURE_ARGS+=	--with-use-script-url
 .endif
 
-.if !defined(WITH_NPH)
+.if !${PORT_OPTIONS:MNPH}
 PLIST_SUB+=		NPHFLAG="@comment "
 CONFIGURE_ARGS+=	--without-nph
 .else
 PLIST_SUB+=		NPHFLAG=
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 PLIST_SUB+=		DEBUGFLAG=
 CONFIGURE_ARGS+=	--with-cgiwrapd
 .else
 PLIST_SUB+=		DEBUGFLAG="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	accesscontrol.html afs.html changes.html \
 		chroot.html comments.html download.html faq.html \
 		index.html install.html intro.html maillist.html \
@@ -131,15 +136,15 @@
 post-install:
 	@${STRIP_CMD} ${INSTALL_DIR}/cgiwrap
 	@${CHMOD} 4550 ${INSTALL_DIR}/cgiwrap
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 	@${STRIP_CMD} ${INSTALL_DIR}/cgiwrapd
 	@${CHMOD} 4550 ${INSTALL_DIR}/cgiwrapd
-.if defined(WITH_NPH)
+.if ${PORT_OPTIONS:MNPH}
 	@${STRIP_CMD} ${INSTALL_DIR}/nph-cgiwrapd
 	@${CHMOD} 4550 ${INSTALL_DIR}/nph-cgiwrapd
 .endif
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/htdocs/${f} ${DOCSDIR}
@@ -151,4 +156,4 @@
 		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- cgiwrap-4.1.patch ends here ---

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