- Actually install configuration file and use @sample.

- Use @sample for the sample database.
- Set NO_ARCH.

3 files changed, 18 insertions, 63 deletions

diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile
index e34e897a31e6..e1cf89445828 100644
--- a/net-mgmt/rackmonkey/Makefile
+++ b/net-mgmt/rackmonkey/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	rackmonkey
 PORTVERSION=	1.2.5
 DISTVERSIONSUFFIX=	-1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF \
 		ftp://ftp.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/ \
@@ -24,6 +24,7 @@ OPTIONS_DEFAULT=	SQLITE INIT_DB SAMPLE
 INIT_DB_DESC=	Initialize DB at installation (SQLite Only)
 SAMPLE_DESC=	Install sample data (SQLite Only)
 
+NO_ARCH=	yes
 NO_BUILD=	YES
 
 USES=		perl5
@@ -48,49 +49,35 @@ RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 .if ${PORT_OPTIONS:MINIT_DB}
 PLIST_SUB+=	INIT_DB=""
-INIT_DB=	yes
 .else
 PLIST_SUB+=	INIT_DB="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSAMPLE}
-SAMPLE=	yes
-.endif
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/
-	${INSTALL} ${WRKSRC}/perl/rackmonkey.pl ${WRKSRC}/perl/rack2xls.pl ${WRKSRC}/perl/rackdns.pl ${STAGEDIR}${WWWDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/perl/rackmonkey.pl ${WRKSRC}/perl/rack2xls.pl ${WRKSRC}/perl/rackdns.pl ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/www && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} tmpl ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/perl && ${COPYTREE_SHARE} RackMonkey ${STAGEDIR}${WWWDIR}/
-	${MKDIR} ${WRKDIR}/build_conf; \
-	${CP} ${WRKSRC}/conf/rackmonkey.conf-default ${WRKDIR}/build_conf/rackmonkey.conf; \
-	if [ "${USES:Msqlite}" ]; then \
-		${ECHO} "Building with SQLite............."; \
-		${SED} -i '' -e 's%dbconnect =%dbconnect = dbi:SQLite:dbname=${WWWDIR}/rackmonkey.db%' ${WRKDIR}/build_conf/rackmonkey.conf; \
-		if [ "${INIT_DB}" ]; then \
-			if [ -e "${STAGEDIR}${WWWDIR}/rackmonkey.db" ]; then \
-				${ECHO} "Database exists, skipping initalization..."; \
-			else \
-				${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db < ${WRKSRC}/sql/schema/schema.sqlite.sql; \
-				${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db < ${WRKSRC}/sql/data/default_data.sql; \
-				if [ "${SAMPLE}" ]; then \
-					${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db < ${WRKSRC}/sql/data/sample_data.sql; \
-				fi \
-			fi \
-		fi \
-	elif [ "${USE_MYSQL}" -o "${USES:MPGSQL}" ]; then  \
-		${INSTALL} ${WRKSRC}/conf/rackmonkey.conf-default ${STAGEDIR}${WWWDIR}/; \
-	fi
-	if [ -e "${WWWDIR}/rackmonkey.conf" ]; then \
-		${MV} ${WWWDIR}/rackmonkey.conf ${STAGEDIR}${WWWDIR}/rackmonkey.conf.old; \
-	fi
+	${MKDIR} ${WRKDIR}/build_conf
+	${CP} ${WRKSRC}/conf/rackmonkey.conf-default ${WRKDIR}/build_conf/rackmonkey.conf
+.if ${PORT_OPTIONS:MSQLITE}
+	${SED} -i '' -e 's%dbconnect =%dbconnect = dbi:SQLite:dbname=${WWWDIR}/rackmonkey.db%' ${WRKDIR}/build_conf/rackmonkey.conf
+.if ${PORT_OPTIONS:MINIT_DB}
+	${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db.sample < ${WRKSRC}/sql/schema/schema.sqlite.sql
+	${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db.sample < ${WRKSRC}/sql/data/default_data.sql
+.if ${PORT_OPTIONS:MSAMPLE}
+	${LOCALBASE}/bin/sqlite3 ${STAGEDIR}${WWWDIR}/rackmonkey.db.sample < ${WRKSRC}/sql/data/sample_data.sql
+.endif
+.endif
+.endif
 	${SED} -i '' \
 		-e 's/#plugin_xls/plugin_xls/' \
 		-e 's/#plugin_dns/plugin_dns/' \
 		-e 's%tmplpath =%tmplpath = ${WWWDIR}/tmpl%' \
 		-e 's%wwwpath =%wwwpath = /rackmonkey%' \
 		${WRKDIR}/build_conf/rackmonkey.conf
+	${INSTALL_DATA} ${WRKDIR}/build_conf/rackmonkey.conf ${STAGEDIR}${WWWDIR}/rackmonkey.conf.sample
 	cd ${WRKSRC} && ${COPYTREE_SHARE} sql ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${WWWDIR}/
 
diff --git a/net-mgmt/rackmonkey/pkg-deinstall b/net-mgmt/rackmonkey/pkg-deinstall
deleted file mode 100644
index 377f93dbbe99..000000000000
--- a/net-mgmt/rackmonkey/pkg-deinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-
-# Check for an sqlite file and print a message if there is one.
-if [ $2 = "POST-DEINSTALL" ]; then
-	if [ -e ${WWWDIR}/rackmonkey.db ]; then
-		echo; echo; echo; 
-		echo "      ******************************"
-		echo "      *           NOTICE           *"
-		echo "      ******************************"
-		echo "If you no longer need it, you may delete "
-		echo "${WWWDIR}/rackmonkey.db"
-		echo "and it's parent directory, ${WWWDIR}"
-		echo; echo; echo;
-	fi
-fi
diff --git a/net-mgmt/rackmonkey/pkg-plist b/net-mgmt/rackmonkey/pkg-plist
index 8d3952784e71..f8b4a8e8c6a0 100644
--- a/net-mgmt/rackmonkey/pkg-plist
+++ b/net-mgmt/rackmonkey/pkg-plist
@@ -1,7 +1,8 @@
 @owner www
 @group www
+@sample %%WWWDIR%%/rackmonkey.conf.sample
+%%INIT_DB%%@sample %%WWWDIR%%/rackmonkey.db.sample
 %%WWWDIR%%/rackmonkey.pl
-%%INIT_DB%%%%WWWDIR%%/rackmonkey.db
 %%WWWDIR%%/rack2xls.pl
 %%WWWDIR%%/rackdns.pl
 %%WWWDIR%%/graphics/favicon.ico
@@ -128,22 +129,5 @@
 %%WWWDIR%%/doc/licence.txt
 %%WWWDIR%%/doc/troubleshooting.txt
 %%WWWDIR%%/doc/upgrade.txt
-@unexec if cmp -s %D/%%WWWDIR%%/rackmonkey.conf-default %D/%%WWWDIR%%/rackmonkey.conf; then rm -f %D/%%WWWDIR%%/rackmonkey.conf; fi
-@exec if [ ! -f %D/%%WWWDIR%%/rackmonkey.conf ] ; then cp -p %D/%F %B/%%WWWDIR%%/rackmonkey.conf; fi
-@dir %%WWWDIR%%/graphics/help
-@dir %%WWWDIR%%/graphics/icons
-@dir %%WWWDIR%%/graphics
-@dir %%WWWDIR%%/javascript
-@dir %%WWWDIR%%/styles
-@dir %%WWWDIR%%/tmpl
-@dir %%WWWDIR%%/RackMonkey
-@dir %%WWWDIR%%/sql/data
-@dir %%WWWDIR%%/sql/migration/3
-@dir %%WWWDIR%%/sql/migration/4
-@dir %%WWWDIR%%/sql/migration
-@dir %%WWWDIR%%/sql/schema
-@dir %%WWWDIR%%/sql
-@dir %%WWWDIR%%/doc
-@dir %%WWWDIR%%/
 @owner
 @group