5 files changed, 27 insertions, 15 deletions

diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index 57d278c982bb..ce4aea27690f 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ipplan
-PORTVERSION=	4.55
+PORTVERSION=	4.56
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	iptrack
-DISTNAME=	${PORTNAME}-4.55
+DISTNAME=	${PORTNAME}-4.56
 
 MAINTAINER=	mt@primats.org.ua
 COMMENT=	IP address management and tracking
@@ -23,8 +23,10 @@ USE_PHP=	gettext pcre xml zlib
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 IPPLANDIR?=	share/${PORTNAME}
-PKGMESSAGE=	${WRKDIR}/pkg-message
+CONFIG=		config.php
+SUB_FILES=	pkg-message
 PLIST_SUB=	IPPLANDIR=${IPPLANDIR}
+SUB_LIST+=	IPPLANDIR=${IPPLANDIR}
 
 .if !defined(WITHOUT_MYSQL)
 USE_PHP+=	mysql
@@ -50,15 +52,22 @@ post-patch:
 		${WRKSRC}/config.php
 	@${FIND} ${WRKSRC} -name '*.orig' -delete -o -name '*.bak' -delete
 
+pre-install:
+	@${MV} ${WRKSRC}/${CONFIG} ${WRKSRC}/${CONFIG}.sample
+
 do-install:
 	@${MKDIR} ${PREFIX}/${IPPLANDIR}
-	@${CP} -R ${WRKSRC}/* ${PREFIX}/${IPPLANDIR}
+	@cd ${WRKSRC} && ${FIND} * | \
+	${CPIO} -dlmp -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${IPPLANDIR}
 
 post-install:
+.if !exists(${PREFIX}/${IPPLANDIR}/${CONFIG})
+	@${INSTALL_DATA} ${WRKSRC}/${CONFIG}.sample \
+	${PREFIX}/${IPPLANDIR}/${CONFIG}
+.endif
 	@${MKDIR} -m 700 /var/spool/ipplan/uploads \
 		/var/spool/ipplan/exportdns
 	@${CHOWN} -R www:www /var/spool/ipplan
-	@${SED} -e 's|%IPPLANDIR%|${PREFIX}/${IPPLANDIR}|g' ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 .if defined(WITH_PGSQL)
 	@${REINPLACE_CMD} -e 's|INSTALL|INSTALL-POSTGRESQL|g' ${PKGMESSAGE}
 .endif
diff --git a/net-mgmt/ipplan/distinfo b/net-mgmt/ipplan/distinfo
index 56df660f98c7..3948d2abf3c8 100644
--- a/net-mgmt/ipplan/distinfo
+++ b/net-mgmt/ipplan/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipplan-4.55.tar.gz) = 3e8d140584bf908c0be53ca03bf6f5b0
-SHA256 (ipplan-4.55.tar.gz) = e8c8d391b6ddcf0e6f48e972500f9f05f17ace20111f1966ac9c804e95d7a644
-SIZE (ipplan-4.55.tar.gz) = 1333149
+MD5 (ipplan-4.56.tar.gz) = c678d73377d026cfb614c343f2b703af
+SHA256 (ipplan-4.56.tar.gz) = e3f1e41cd025e729f5e78f106d908aee85303c4abecfe49faac29ec770fb1d4a
+SIZE (ipplan-4.56.tar.gz) = 1335180
diff --git a/net-mgmt/ipplan/files/pkg-message.in b/net-mgmt/ipplan/files/pkg-message.in
new file mode 100644
index 000000000000..a32fefc8f17f
--- /dev/null
+++ b/net-mgmt/ipplan/files/pkg-message.in
@@ -0,0 +1,6 @@
+*******************************************************************************
+IPPlan's installation hasn't completed yet. 
+Please read %%PREFIX%%/%%IPPLANDIR%%/INSTALL carefully and follow it.
+If you won't use Mysql as default database, according to your database, 
+install required port and read %%PREFIX%%/%%IPPLANDIR%%/INSTALL-[ORACLE9i|POSTGRESQL]
+*******************************************************************************
diff --git a/net-mgmt/ipplan/pkg-message b/net-mgmt/ipplan/pkg-message
deleted file mode 100644
index e502e1435bf0..000000000000
--- a/net-mgmt/ipplan/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-IPPlan's installation hasn't completed yet. Please read
-%IPPLANDIR%/INSTALL carefully and follow it.
-If you won't use Mysql as default database, according to
-your database, install required port and read
-%IPPLANDIR%/INSTALL-[ORACLE9i|POSTGRESQL]
diff --git a/net-mgmt/ipplan/pkg-plist b/net-mgmt/ipplan/pkg-plist
index 0aa70ffa6a74..fba1ae219df1 100644
--- a/net-mgmt/ipplan/pkg-plist
+++ b/net-mgmt/ipplan/pkg-plist
@@ -1,3 +1,4 @@
+@unexec if cmp -s %D/%%IPPLANDIR%%/config.php %D/%%IPPLANDIR%%/config.php.sample ; then rm -f %D/%%IPPLANDIR%%/config.php; fi
 %%IPPLANDIR%%/CHANGELOG
 %%IPPLANDIR%%/CONTRIBUTORS
 %%IPPLANDIR%%/DNS-USAGE
@@ -201,7 +202,7 @@
 %%IPPLANDIR%%/class.phpmailer.php
 %%IPPLANDIR%%/class.smtp.php
 %%IPPLANDIR%%/class.templib.php
-%%IPPLANDIR%%/config.php
+%%IPPLANDIR%%/config.php.sample
 %%IPPLANDIR%%/contrib/bind9_revzone.xsl
 %%IPPLANDIR%%/contrib/bind9_zone.dtd
 %%IPPLANDIR%%/contrib/bind9_zone.xsl
@@ -463,6 +464,7 @@
 %%IPPLANDIR%%/templates/swip_wdb1.4_new.xsl
 %%IPPLANDIR%%/themes/default.css
 %%IPPLANDIR%%/themes/pastel.css
+%%IPPLANDIR%%/themes/penguin.css
 %%IPPLANDIR%%/user/Net/DNS.php
 %%IPPLANDIR%%/user/Net/DNS/Header.php
 %%IPPLANDIR%%/user/Net/DNS/Packet.php
@@ -591,4 +593,4 @@
 @dirrm %%IPPLANDIR%%/adodb/contrib
 @dirrm %%IPPLANDIR%%/adodb
 @dirrm %%IPPLANDIR%%/admin
-@dirrm %%IPPLANDIR%%
+@dirrmtry %%IPPLANDIR%%