diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2005-12-26 21:43:31 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2005-12-26 21:43:31 +0000 |
commit | 189e89ae534fe27a37862a812776cd62cec440e0 (patch) | |
tree | 4b3917a4d8673b2779e0512276255209705a19a2 | |
parent | Fix typo: incorrect PLIST commit (diff) |
don't overwrite user configuration files.
Notes
Notes:
svn path=/head/; revision=152126
-rw-r--r-- | misc/tinderbox/Makefile | 6 | ||||
-rw-r--r-- | misc/tinderbox/files/pkg-message.in | 5 | ||||
-rw-r--r-- | misc/tinderbox/pkg-plist | 6 | ||||
-rw-r--r-- | ports-mgmt/tinderbox-devel/Makefile | 6 | ||||
-rw-r--r-- | ports-mgmt/tinderbox-devel/files/pkg-message.in | 5 | ||||
-rw-r--r-- | ports-mgmt/tinderbox-devel/pkg-plist | 6 | ||||
-rw-r--r-- | ports-mgmt/tinderbox/Makefile | 6 | ||||
-rw-r--r-- | ports-mgmt/tinderbox/files/pkg-message.in | 5 | ||||
-rw-r--r-- | ports-mgmt/tinderbox/pkg-plist | 6 |
9 files changed, 39 insertions, 12 deletions
diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile index 3879b607020e..cb5049958672 100644 --- a/misc/tinderbox/Makefile +++ b/misc/tinderbox/Makefile @@ -6,6 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -38,6 +39,11 @@ USE_MYSQL= yes RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql .endif +post-extract: +.for f in inc_ds.php inc_tinderbox.php + ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist +.endfor + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts diff --git a/misc/tinderbox/files/pkg-message.in b/misc/tinderbox/files/pkg-message.in index 61fb23745613..0cc18c1f3359 100644 --- a/misc/tinderbox/files/pkg-message.in +++ b/misc/tinderbox/files/pkg-message.in @@ -20,7 +20,8 @@ The following walkthrough is for PostgreSQL databases: The following walkthrough is the tinderbox environment setup: -- Edit the file %%PREFIX%%/scripts/tinderbox.ph +- Edit the file %%PREFIX%%/scripts/tinderbox.ph (copy from + tinderbox.ph.dist) - $BUILD_ROOT should be "%%PREFIX%%/tinderbox" - $SUBJECT should be "My Tinderbox" @@ -32,12 +33,14 @@ The following walkthrough is the tinderbox environment setup: - Comment out the lines after "for www", and uncomment the lines - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_ds.php + (copy from inc_ds.php.dist) - $DB_HOST should be localhost - $DB_DRIVER should be pgsql - $DB_USER should be tinderbox - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_tinderbox.php + (copy from inc_tinderbox.php.dist) - $rootdir should be %%PREFIX%%/tinderbox - $wwwrooturi should be /tb diff --git a/misc/tinderbox/pkg-plist b/misc/tinderbox/pkg-plist index 2a202d8dbebe..e8c5d92e8542 100644 --- a/misc/tinderbox/pkg-plist +++ b/misc/tinderbox/pkg-plist @@ -79,8 +79,8 @@ tinderbox/scripts/www-exp/templates/default/user_admin.tpl tinderbox/scripts/www-exp/templates/default/user_permissions.tpl tinderbox/scripts/www-exp/templates/default/user_properties.tpl tinderbox/scripts/www-exp/templates/default/current_buildports.tpl -tinderbox/scripts/www-exp/inc_ds.php -tinderbox/scripts/www-exp/inc_tinderbox.php +tinderbox/scripts/www-exp/inc_ds.php-dist +tinderbox/scripts/www-exp/inc_tinderbox.php-dist tinderbox/scripts/www-exp/index.php tinderbox/scripts/tinderbox-mysql.schema tinderbox/scripts/tc @@ -106,7 +106,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/www-exp/templates @dirrm tinderbox/scripts/www-exp/module @dirrm tinderbox/scripts/www-exp/core -@dirrm tinderbox/scripts/www-exp @dirrm tinderbox/scripts/www @dirrm tinderbox/scripts/upgrade @dirrm tinderbox/scripts/man/man1 @@ -114,5 +113,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/lib @dirrm tinderbox/scripts/etc/rc.d @dirrm tinderbox/scripts/etc +@unexec rmdir %D/tinderbox/www-exp 2>/dev/null || true @unexec rmdir %D/tinderbox/scripts 2>/dev/null || true @unexec rmdir %D/tinderbox 2>/dev/null || true diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile index 3879b607020e..cb5049958672 100644 --- a/ports-mgmt/tinderbox-devel/Makefile +++ b/ports-mgmt/tinderbox-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -38,6 +39,11 @@ USE_MYSQL= yes RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql .endif +post-extract: +.for f in inc_ds.php inc_tinderbox.php + ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist +.endfor + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts diff --git a/ports-mgmt/tinderbox-devel/files/pkg-message.in b/ports-mgmt/tinderbox-devel/files/pkg-message.in index 61fb23745613..0cc18c1f3359 100644 --- a/ports-mgmt/tinderbox-devel/files/pkg-message.in +++ b/ports-mgmt/tinderbox-devel/files/pkg-message.in @@ -20,7 +20,8 @@ The following walkthrough is for PostgreSQL databases: The following walkthrough is the tinderbox environment setup: -- Edit the file %%PREFIX%%/scripts/tinderbox.ph +- Edit the file %%PREFIX%%/scripts/tinderbox.ph (copy from + tinderbox.ph.dist) - $BUILD_ROOT should be "%%PREFIX%%/tinderbox" - $SUBJECT should be "My Tinderbox" @@ -32,12 +33,14 @@ The following walkthrough is the tinderbox environment setup: - Comment out the lines after "for www", and uncomment the lines - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_ds.php + (copy from inc_ds.php.dist) - $DB_HOST should be localhost - $DB_DRIVER should be pgsql - $DB_USER should be tinderbox - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_tinderbox.php + (copy from inc_tinderbox.php.dist) - $rootdir should be %%PREFIX%%/tinderbox - $wwwrooturi should be /tb diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist index 2a202d8dbebe..e8c5d92e8542 100644 --- a/ports-mgmt/tinderbox-devel/pkg-plist +++ b/ports-mgmt/tinderbox-devel/pkg-plist @@ -79,8 +79,8 @@ tinderbox/scripts/www-exp/templates/default/user_admin.tpl tinderbox/scripts/www-exp/templates/default/user_permissions.tpl tinderbox/scripts/www-exp/templates/default/user_properties.tpl tinderbox/scripts/www-exp/templates/default/current_buildports.tpl -tinderbox/scripts/www-exp/inc_ds.php -tinderbox/scripts/www-exp/inc_tinderbox.php +tinderbox/scripts/www-exp/inc_ds.php-dist +tinderbox/scripts/www-exp/inc_tinderbox.php-dist tinderbox/scripts/www-exp/index.php tinderbox/scripts/tinderbox-mysql.schema tinderbox/scripts/tc @@ -106,7 +106,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/www-exp/templates @dirrm tinderbox/scripts/www-exp/module @dirrm tinderbox/scripts/www-exp/core -@dirrm tinderbox/scripts/www-exp @dirrm tinderbox/scripts/www @dirrm tinderbox/scripts/upgrade @dirrm tinderbox/scripts/man/man1 @@ -114,5 +113,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/lib @dirrm tinderbox/scripts/etc/rc.d @dirrm tinderbox/scripts/etc +@unexec rmdir %D/tinderbox/www-exp 2>/dev/null || true @unexec rmdir %D/tinderbox/scripts 2>/dev/null || true @unexec rmdir %D/tinderbox 2>/dev/null || true diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile index 3879b607020e..cb5049958672 100644 --- a/ports-mgmt/tinderbox/Makefile +++ b/ports-mgmt/tinderbox/Makefile @@ -6,6 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -38,6 +39,11 @@ USE_MYSQL= yes RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql .endif +post-extract: +.for f in inc_ds.php inc_tinderbox.php + ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist +.endfor + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts diff --git a/ports-mgmt/tinderbox/files/pkg-message.in b/ports-mgmt/tinderbox/files/pkg-message.in index 61fb23745613..0cc18c1f3359 100644 --- a/ports-mgmt/tinderbox/files/pkg-message.in +++ b/ports-mgmt/tinderbox/files/pkg-message.in @@ -20,7 +20,8 @@ The following walkthrough is for PostgreSQL databases: The following walkthrough is the tinderbox environment setup: -- Edit the file %%PREFIX%%/scripts/tinderbox.ph +- Edit the file %%PREFIX%%/scripts/tinderbox.ph (copy from + tinderbox.ph.dist) - $BUILD_ROOT should be "%%PREFIX%%/tinderbox" - $SUBJECT should be "My Tinderbox" @@ -32,12 +33,14 @@ The following walkthrough is the tinderbox environment setup: - Comment out the lines after "for www", and uncomment the lines - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_ds.php + (copy from inc_ds.php.dist) - $DB_HOST should be localhost - $DB_DRIVER should be pgsql - $DB_USER should be tinderbox - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_tinderbox.php + (copy from inc_tinderbox.php.dist) - $rootdir should be %%PREFIX%%/tinderbox - $wwwrooturi should be /tb diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist index 2a202d8dbebe..e8c5d92e8542 100644 --- a/ports-mgmt/tinderbox/pkg-plist +++ b/ports-mgmt/tinderbox/pkg-plist @@ -79,8 +79,8 @@ tinderbox/scripts/www-exp/templates/default/user_admin.tpl tinderbox/scripts/www-exp/templates/default/user_permissions.tpl tinderbox/scripts/www-exp/templates/default/user_properties.tpl tinderbox/scripts/www-exp/templates/default/current_buildports.tpl -tinderbox/scripts/www-exp/inc_ds.php -tinderbox/scripts/www-exp/inc_tinderbox.php +tinderbox/scripts/www-exp/inc_ds.php-dist +tinderbox/scripts/www-exp/inc_tinderbox.php-dist tinderbox/scripts/www-exp/index.php tinderbox/scripts/tinderbox-mysql.schema tinderbox/scripts/tc @@ -106,7 +106,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/www-exp/templates @dirrm tinderbox/scripts/www-exp/module @dirrm tinderbox/scripts/www-exp/core -@dirrm tinderbox/scripts/www-exp @dirrm tinderbox/scripts/www @dirrm tinderbox/scripts/upgrade @dirrm tinderbox/scripts/man/man1 @@ -114,5 +113,6 @@ tinderbox/scripts/tinderbox-pgsql.schema @dirrm tinderbox/scripts/lib @dirrm tinderbox/scripts/etc/rc.d @dirrm tinderbox/scripts/etc +@unexec rmdir %D/tinderbox/www-exp 2>/dev/null || true @unexec rmdir %D/tinderbox/scripts 2>/dev/null || true @unexec rmdir %D/tinderbox 2>/dev/null || true |