ports/171817: [PATCH] ports-mgmt/tinderbox: OptionsNG, pkg-message.in changed

Thu Sep 20 18:30:11 UTC 2012

>Number:         171817
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/tinderbox: OptionsNG, pkg-message.in changed
>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:   Thu Sep 20 18:30:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:

Switched to OptionsNG


pkg-message.in changed:

Fix for Hiawatha

-Alias = /tb/:%%PREFIX%%/tinderbox/scripts/webui
+Alias = /tb/webui:%%PREFIX%%/tinderbox/scripts/webui


-  Check your system by going to http://localhost/tb/
+  Check your system by going to http://localhost/tb/ or http://localhost/

+****************************************************
+
+Add to yours /etc/rc.conf to start Tinderbox at boot time
+
+tinderd_enable="yes"
+tinderd_directory="%%PREFIX%%/tinderbox/scripts"
+tinderd_flags="-nullfs"
+
+****************************************************

Port maintainer (itetcu at FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
WARN: Makefile: no port directory /usr/ports/databases/p5-DBD-mysql${MYSQL_VER} found, even though it is listed in RUN_DEPENDS.
0 fatal errors and 3 warnings found.


Build log RedPorts

https://redports.org/buildarchive/20120920171045-22827/

>Fix:

--- tinderbox-3.4.1_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/Makefile ./Makefile
--- /usr/ports/ports-mgmt/tinderbox/Makefile	2012-08-18 16:29:08.000000000 +0200
+++ ./Makefile	2012-09-20 20:10:47.000000000 +0200
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -17,33 +17,43 @@
 
 CONFLICTS=	tinderbox-devel-[0-9]*
 
-OPTIONS=	PGSQL "With pgsql" Off \
-		MYSQL "With mysql" On \
-		CSUP  "Use csup for updates" On \
-		CVSUP "Use cvsup for updates" Off \
-		WEBUI   "Install web interface" On \
-		APACHE "Use Apache for web interface" On \
-		HIAWATHA "Use Hiawatha for web interface" Off \
-		LIGHTTPD "Use LightHTTPD for web interface" Off \
-		CHECK_FOR_ROOT "Check if ./tc is run by uid 0" On \
-		LSOF "For killMountProcesses() when using nullfs" On
+OPTIONS_DEFINE=	PGSQL \
+		MYSQL \
+		CSUP \
+		WEBUI \
+		APACHE \
+		HIAWATHA \
+		LIGHTTPD \
+		CHECK_FOR_ROOT \
+		LSOF
+
+OPTIONS_DEFAULT=	MYSQL CSUP WEBUI APACHE
+
+CSUP_DESC=	Use csup for updates
+WEBUI_DESC=	Install web interface
+APACHE_DESC=	Use Apache for web interface
+HIAWATHA_DESC=	Use Hiawatha for web interface
+LIGHTTPD_DESC=	Use LightHTTPD for web interface
+CHECK_FOR_ROOT_DESC=	Check if ./tc is run by uid 0
+LSOF_DESC=	For killMountProcesses() when using nullfs
 
 NO_BUILD=	yes
 WANT_PERL=	yes
-SUB_FILES=	pkg-message
 
 MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 		tc-configJail.1 tc-configTinderd.1 tc-init.1
 
+SUB_FILES=	pkg-message
+
 #PATCH_STRIP=	-p2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_PGSQL) && defined(WITHOUT_MYSQL)
+.if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
-.if defined(WITH_WEBUI)
+.if ${PORT_OPTIONS:MWEBUI}
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 PLIST_SUB+=	WEBUI=""
@@ -51,17 +61,17 @@
 PLIST_SUB+=	WEBUI="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-.if defined(WITH_WEBUI)
+.if ${PORT_OPTIONS:MWEBUI}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
 USE_PHP+=	pgsql
 .endif
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
-.if !defined(WITHOUT_MYSQL)
-.if defined(WITH_WEBUI)
+.if ${PORT_OPTIONS:MMYSQL}
+.if ${PORT_OPTIONS:MWEBUI}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
 USE_PHP+=	mysql
 .endif
@@ -69,47 +79,48 @@
 RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
-.if defined(WITH_CVSUP)
+.if ${PORT_OPTIONS:MCVSUP}
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
-.if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
+.if ${PORT_OPTIONS:MAPACHE} && ${PORT_OPTIONS:MWEBUI}
 USE_APACHE_RUN=	22+
-.elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
+.elif ${PORT_OPTIONS:MLIGHTTPD} && ${PORT_OPTIONS:MWEBUI}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
-.elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI)
+.elif ${PORT_OPTIONS:MHIAWATHA} && ${PORT_OPTIONS:MWEBUI}
 RUN_DEPENDS+=	hiawatha:${PORTSDIR}/www/hiawatha
 .endif
 
-.if defined(WITH_LSOF)
+.if ${PORT_OPTIONS:MLSOF}
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
 pre-everything::
-.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD) || defined(WITH_HIAWATHA)) && !defined(WITH_WEBUI)
+.if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MHIAWATHA} && ! ${PORT_OPTIONS:MWEBUI}
 	@${ECHO_CMD} "It doesn't make sense to depend on Apache, LightHTTPD or Hiawatha if not using the WebUI."
-	@${FALSE}
+	${FALSE}
 .endif
 
-.if !defined(WITH_WEBUI)
+.if ! ${PORT_OPTIONS:MWEBUI}
 post-extract:
-	@${RM} -R ${WRKSRC}/webui
+	${RM} -R ${WRKSRC}/webui
 .endif
 
 post-patch:
-.ifdef WITHOUT_CHECK_FOR_ROOT
+.if ! ${PORT_OPTIONS:MCHECK_FOR_ROOT}
 	${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \
 		${WRKSRC}/tc
 .endif
 	${REINPLACE_CMD} -e 's/.set_rcvar./tinderd_enable/' \
+		-e 's|/space/scripts|/usr/local/tinderbox/scripts|' \
 		${WRKSRC}/etc/rc.d/tinderd
-	@cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;
+	@(cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;)
 
 do-install:
-	@${MKDIR} ${PREFIX}/tinderbox/scripts
+	${MKDIR} ${PREFIX}/tinderbox/scripts
 	@${ECHO_CMD} "Installing man pages ..."
-	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
-		cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man
+	@(cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/ && \
+		${RM} -r ${WRKSRC}/man)
 	@${ECHO_CMD} "Installing rc script ..."
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME}
 	@${ECHO_CMD} "Installing tinderbox ..."
@@ -118,6 +129,9 @@
 	@${ECHO_CMD} "All Done"
 
 post-install:
+# pkg-message
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/ports-mgmt/tinderbox/files/pkg-message.in	2010-10-24 19:43:28.000000000 +0200
+++ ./files/pkg-message.in	2012-09-19 23:24:34.000000000 +0200
@@ -41,9 +41,19 @@
 Alias = /tb/packages:%%PREFIX%%/tinderbox/packages
 Alias = /tb/errors:%%PREFIX%%/tinderbox/errors
 Alias = /tb/wrkdirs:%%PREFIX%%/tinderbox/wrkdirs
-Alias = /tb/:%%PREFIX%%/tinderbox/scripts/webui
+Alias = /tb/webui:%%PREFIX%%/tinderbox/scripts/webui
 
-  Check your system by going to http://localhost/tb/
+  Check your system by going to http://localhost/tb/ or http://localhost/
 
-=============================================================================
 
+****************************************************
+
+Add to yours /etc/rc.conf to start Tinderbox at boot time
+
+tinderd_enable="yes"
+tinderd_directory="%%PREFIX%%/tinderbox/scripts"
+tinderd_flags="-nullfs"
+
+****************************************************
+
+=============================================================================
--- tinderbox-3.4.1_2.patch ends here ---

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

