- add Aron Schlesinger www-exp layout and make it the default since: it looks

better, it works better in opera, it provides a slightly better usability and
it's more FreeBSDish
- fetch all DISTFILES from my server for simplicity
- bump PORTREVISION for plist changes

Prompted by:	miwi@'s tindy :-)

8 files changed, 108 insertions, 58 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 6b216e3548dc..0df91922e1d6 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -6,8 +6,10 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://tinderbox.marcuscom.com/
+MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
+DIST_SUBDIR=	tinderbox
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
@@ -39,9 +41,8 @@ IGNORE=	is useless without a database. Please (re)run 'make config' and choose o
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
-MASTER_SITES+=	http://miwibox.org/:FAVICON
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		favicon.ico:FAVICON
+		favicon.ico tb242_template_paefchen_v2.tbz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
@@ -96,6 +97,22 @@ pre-everything::
 	@${FALSE}
 .endif
 
+post-extract:
+.if !defined(WITH_WEB)
+	@${RM} -R ${WRKSRC}/www
+.else
+	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/www
+.endif
+.if defined(WITHOUT_WEB_EXP)
+	@${RM} -R ${WRKSRC}/www-exp
+.else
+	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/www-exp
+	@${TAR} -C ${WRKSRC}/www-exp/templates -xf ${_DISTDIR}/tb242_template_paefchen_v2.tbz
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/www-exp/templates/paefchen
+	@${REINPLACE_CMD} 's|/templates/default|/templates/paefchen|' ${WRKSRC}/www-exp/inc_tinderbox.php.dist
+	@${RM} ${WRKSRC}/www-exp/inc_tinderbox.php.dist.bak
+.endif
+
 post-patch:
 .if defined(WITH_MYSQL)
 	@${REINPLACE_CMD} \
@@ -103,26 +120,6 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
-.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
-	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
-		${WRKSRC}/create
-	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
-		${WRKSRC}/tc
-	@${RM} ${WRKSRC}/create.bak
-	@${RM} ${WRKSRC}/tc.bak
-.endif
-
-pre-install:
-.if !defined(WITH_WEB)
-	${RM} -R ${WRKSRC}/www
-.else
-	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www
-.endif
-.if defined(WITHOUT_WEB_EXP)
-	${RM} -R ${WRKSRC}/www-exp
-.else
-	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www-exp
-.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 27abad8dc9b7..0d72a2a6ad93 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,6 +1,9 @@
-MD5 (tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
-SHA256 (tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
-SIZE (tinderbox-2.4.2.tar.gz) = 130770
-MD5 (favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
-SHA256 (favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
-SIZE (favicon.ico) = 4710
+MD5 (tinderbox/tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
+SHA256 (tinderbox/tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
+SIZE (tinderbox/tinderbox-2.4.2.tar.gz) = 130770
+MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
+SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
+SIZE (tinderbox/favicon.ico) = 4710
+MD5 (tinderbox/tb242_template_paefchen_v2.tbz) = 80557c9012ad4ca66dcf94e04747dc44
+SHA256 (tinderbox/tb242_template_paefchen_v2.tbz) = f875dc4edf69f357a6cfba54c4a9a9f21d251127d4146280cb761aa44dd7ec41
+SIZE (tinderbox/tb242_template_paefchen_v2.tbz) = 7923
diff --git a/ports-mgmt/tinderbox-devel/files/pkg-message.in b/ports-mgmt/tinderbox-devel/files/pkg-message.in
index 5c575ad624d0..18ae33f0698c 100644
--- a/ports-mgmt/tinderbox-devel/files/pkg-message.in
+++ b/ports-mgmt/tinderbox-devel/files/pkg-message.in
@@ -1,3 +1,5 @@
+
+===============================================================================
 ports-mgmt/tinderbox is now installed, but it requires some additional setup.
 
 ****************************************************
@@ -130,4 +132,5 @@ tinderbox and should be executed in %%PREFIX%%/tinderbox/scripts.
 
 - At a certain moment, when you refresh the page, you see that it
   has changed.
+=============================================================================
 
diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist
index f360e2d0cac9..ed0ce52154f7 100644
--- a/ports-mgmt/tinderbox-devel/pkg-plist
+++ b/ports-mgmt/tinderbox-devel/pkg-plist
@@ -99,6 +99,26 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_admin.tpl
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_properties.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/images/hdr_fill.png
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/config.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/current_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/describe_port.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/display_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/failed_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/footer.inc.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/header.inc.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/latest_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_builds.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_failure_reasons.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_tinderd_queue.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/messages.inc
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/please_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/rss.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_admin.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_permissions.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_properties.tpl
 %%WEB%%tinderbox/scripts/www/Build.php
 %%WEB%%tinderbox/scripts/www/Jail.php
 %%WEB%%tinderbox/scripts/www/Makefile
@@ -116,6 +136,8 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%WEB%%tinderbox/scripts/www/showport.php
 %%WEB%%tinderbox/scripts/www/tinderstyle.css
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/paefchen/images
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/paefchen
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 6b216e3548dc..0df91922e1d6 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -6,8 +6,10 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://tinderbox.marcuscom.com/
+MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
+DIST_SUBDIR=	tinderbox
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
@@ -39,9 +41,8 @@ IGNORE=	is useless without a database. Please (re)run 'make config' and choose o
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
-MASTER_SITES+=	http://miwibox.org/:FAVICON
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		favicon.ico:FAVICON
+		favicon.ico tb242_template_paefchen_v2.tbz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
@@ -96,6 +97,22 @@ pre-everything::
 	@${FALSE}
 .endif
 
+post-extract:
+.if !defined(WITH_WEB)
+	@${RM} -R ${WRKSRC}/www
+.else
+	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/www
+.endif
+.if defined(WITHOUT_WEB_EXP)
+	@${RM} -R ${WRKSRC}/www-exp
+.else
+	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/www-exp
+	@${TAR} -C ${WRKSRC}/www-exp/templates -xf ${_DISTDIR}/tb242_template_paefchen_v2.tbz
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/www-exp/templates/paefchen
+	@${REINPLACE_CMD} 's|/templates/default|/templates/paefchen|' ${WRKSRC}/www-exp/inc_tinderbox.php.dist
+	@${RM} ${WRKSRC}/www-exp/inc_tinderbox.php.dist.bak
+.endif
+
 post-patch:
 .if defined(WITH_MYSQL)
 	@${REINPLACE_CMD} \
@@ -103,26 +120,6 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
-.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
-	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
-		${WRKSRC}/create
-	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
-		${WRKSRC}/tc
-	@${RM} ${WRKSRC}/create.bak
-	@${RM} ${WRKSRC}/tc.bak
-.endif
-
-pre-install:
-.if !defined(WITH_WEB)
-	${RM} -R ${WRKSRC}/www
-.else
-	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www
-.endif
-.if defined(WITHOUT_WEB_EXP)
-	${RM} -R ${WRKSRC}/www-exp
-.else
-	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www-exp
-.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index 27abad8dc9b7..0d72a2a6ad93 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,6 +1,9 @@
-MD5 (tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
-SHA256 (tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
-SIZE (tinderbox-2.4.2.tar.gz) = 130770
-MD5 (favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
-SHA256 (favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
-SIZE (favicon.ico) = 4710
+MD5 (tinderbox/tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
+SHA256 (tinderbox/tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
+SIZE (tinderbox/tinderbox-2.4.2.tar.gz) = 130770
+MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
+SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
+SIZE (tinderbox/favicon.ico) = 4710
+MD5 (tinderbox/tb242_template_paefchen_v2.tbz) = 80557c9012ad4ca66dcf94e04747dc44
+SHA256 (tinderbox/tb242_template_paefchen_v2.tbz) = f875dc4edf69f357a6cfba54c4a9a9f21d251127d4146280cb761aa44dd7ec41
+SIZE (tinderbox/tb242_template_paefchen_v2.tbz) = 7923
diff --git a/ports-mgmt/tinderbox/files/pkg-message.in b/ports-mgmt/tinderbox/files/pkg-message.in
index 5c575ad624d0..18ae33f0698c 100644
--- a/ports-mgmt/tinderbox/files/pkg-message.in
+++ b/ports-mgmt/tinderbox/files/pkg-message.in
@@ -1,3 +1,5 @@
+
+===============================================================================
 ports-mgmt/tinderbox is now installed, but it requires some additional setup.
 
 ****************************************************
@@ -130,4 +132,5 @@ tinderbox and should be executed in %%PREFIX%%/tinderbox/scripts.
 
 - At a certain moment, when you refresh the page, you see that it
   has changed.
+=============================================================================
 
diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist
index f360e2d0cac9..ed0ce52154f7 100644
--- a/ports-mgmt/tinderbox/pkg-plist
+++ b/ports-mgmt/tinderbox/pkg-plist
@@ -99,6 +99,26 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_admin.tpl
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
 %%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_properties.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/images/hdr_fill.png
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/config.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/current_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/describe_port.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/display_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/failed_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/footer.inc.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/header.inc.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/latest_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_builds.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_failure_reasons.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/list_tinderd_queue.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/messages.inc
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/please_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/rss.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_admin.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_permissions.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/paefchen/user_properties.tpl
 %%WEB%%tinderbox/scripts/www/Build.php
 %%WEB%%tinderbox/scripts/www/Jail.php
 %%WEB%%tinderbox/scripts/www/Makefile
@@ -116,6 +136,8 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%WEB%%tinderbox/scripts/www/showport.php
 %%WEB%%tinderbox/scripts/www/tinderstyle.css
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/paefchen/images
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/paefchen
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module
 %%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core