5 files changed, 22 insertions, 120 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index a7db0171368f..c49d38845e78 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	squirrelmail
-PORTVERSION?=	1.4.6
-CATEGORIES?=	mail www
+PORTVERSION=	1.4.6
+CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	squirrelmail
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		all_locales-${PORTVERSION}-20060221${EXTRACT_SUFX}
-DIST_SUBDIR=	squirrelmail
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER?=	simond@irrelevant.org
-COMMENT?=	A webmail system which accesses mail over IMAP
-
-CONFLICTS?=	ja-squirrelmail-1.*
+MAINTAINER=	simond@irrelevant.org
+COMMENT=	A webmail system which accesses mail over IMAP
 
 USE_PHP=	session mhash gettext mbstring pcre openssl xml
 WANT_PHP_WEB=	yes
@@ -34,21 +32,22 @@ USE_PHP+=	ldap
 .endif
 
 .ifndef WITHOUT_WWWDIR
-SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
+SQUIRRELDIR?=	${PREFIX}/www/${PORTNAME}
 .else
-SQUIRRELDIR?=	${PREFIX}/squirrelmail
+SQUIRRELDIR?=	${PREFIX}/${PORTNAME}
 .endif
 
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
 
+SUB_FILES=	pkg-message pkg-install pkg-deinstall
+SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR}
+
+PORTDOCS=	*
+
 pre-everything::
 	@${ECHO_CMD} "SquirrelMail is installed into ${SQUIRRELDIR}"
-	@${ECHO_CMD} "To use the old location ${PREFIX}/squirrelmail define"
+	@${ECHO_CMD} "To use the old location ${PREFIX}/${PORTNAME} define"
 	@${ECHO_CMD} "WITHOUT_WWWDIR when patching or installing"
 	@${ECHO_CMD}
 	@${ECHO_CMD} "Use WITH_LDAP to ensure PHP LDAP support is installed"
@@ -56,20 +55,10 @@ pre-everything::
 	@${ECHO_CMD} "   (note that this does not install the database specific PEAR support, e.g. MySQL)"
 	@${ECHO_CMD}
 
-.if !target(slaveport-post-patch)
-slaveport-post-patch:
-.endif
-
-post-patch: slaveport-post-patch
+post-patch:
 .ifndef PATCH_DEBUG
 	@${RM} -f ${WRKSRC}/config/config_default.php.orig
 .endif
-	@${SED} -e "s;%%SQUIRRELDIR%%;${SQUIRRELDIR};g" \
-		${MASTERDIR}/pkg-install > ${PKGINSTALL}
-	@${SED} -e "s;%%SQUIRRELDIR%%;${SQUIRRELDIR};g" \
-		${MASTERDIR}/pkg-deinstall > ${PKGDEINSTALL}
-	@${SED} -e "s;%%SQUIRRELDIR%%;${SQUIRRELDIR};g" \
-		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/ispell|g' \
 		${WRKSRC}/plugins/squirrelspell/sqspell_config.php
 	@${RM} ${WRKSRC}/plugins/squirrelspell/sqspell_config.php.bak
@@ -105,15 +94,15 @@ do-install:
 	${MKDIR} ${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${PREFIX}/etc/periodic/daily
 	${MKDIR} ${SQUIRRELDIR}
-	${CP} -p ${WRKSRC}/index.php ${SQUIRRELDIR}
-	${CP} -p ${WRKSRC}/configure ${SQUIRRELDIR}
+	@${CP} -pv ${WRKSRC}/index.php ${SQUIRRELDIR}
+	@${CP} -pv ${WRKSRC}/configure ${SQUIRRELDIR}
 .for DIR in class config data functions help images include locale plugins po src themes
-	${CP} -rp ${WRKSRC}/${DIR} ${SQUIRRELDIR}
+	@${CP} -rpv ${WRKSRC}/${DIR} ${SQUIRRELDIR}
 .endfor
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/data
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
+	@${CP} -Rv ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/mail/squirrelmail/pkg-deinstall b/mail/squirrelmail/files/pkg-deinstall.in
index b0738c370e2c..b0738c370e2c 100644
--- a/mail/squirrelmail/pkg-deinstall
+++ b/mail/squirrelmail/files/pkg-deinstall.in
diff --git a/mail/squirrelmail/pkg-install b/mail/squirrelmail/files/pkg-install.in
index 84f4d829c09f..0b09cf9464aa 100644
--- a/mail/squirrelmail/pkg-install
+++ b/mail/squirrelmail/files/pkg-install.in
@@ -47,6 +47,7 @@ POST-INSTALL)
 			cp -rp ${SQUIRRELDIR}/data/default_pref \
 				/var/spool/squirrelmail/pref/default_pref
 		else
+			echo ""
 			echo "An older version of default_pref exists in"
 			echo "/var/spool/squirrelmail/pref, you may want to"
 			echo "compare it with the one in ${SQUIRRELDIR}/data"
diff --git a/mail/squirrelmail/pkg-message b/mail/squirrelmail/files/pkg-message.in
index 6ead7fbf45e7..e1b051f64f50 100644
--- a/mail/squirrelmail/pkg-message
+++ b/mail/squirrelmail/files/pkg-message.in
@@ -15,3 +15,4 @@ session.auto_start = 1
 In order to do your administrative configuration you need to 
 cd %%SQUIRRELDIR%% && ./configure
 SquirrelMail will not work until this has been done.
+
diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist
index 3f86b3374311..411df5ac12aa 100644
--- a/mail/squirrelmail/pkg-plist
+++ b/mail/squirrelmail/pkg-plist
@@ -1,71 +1,4 @@
 etc/periodic/daily/111.clean-squirrelmail
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Development/addressbook.txt
-%%PORTDOCS%%%%DOCSDIR%%/Development/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Development/mime.txt
-%%PORTDOCS%%%%DOCSDIR%%/Development/plugin.txt
-%%PORTDOCS%%%%DOCSDIR%%/Development/rfc_documents.txt
-%%PORTDOCS%%%%DOCSDIR%%/Development/tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.themes
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes-%%PORTVERSION%%.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.3.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.4.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.5.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.2/Notes-1.2.6.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.3/Notes-1.3.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.3/Notes-1.3.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.3/Notes-1.3.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.3.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.3a.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.4.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.5.txt
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/authentication.txt
-%%PORTDOCS%%%%DOCSDIR%%/db-backend.txt
-%%PORTDOCS%%%%DOCSDIR%%/ie_ssl.txt
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/plugins/README.plugins
-%%PORTDOCS%%%%DOCSDIR%%/plugins/abook_take/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/administrator/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/bug_report/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/bug_report/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/calendar/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/delete_move_next/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/fortune/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/info/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/listcommands/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/mail_fetch/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/newmail/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/plugins/newmail/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/spamcop/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/CRYPTO
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/PRIVACY
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/README
-%%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/UPGRADING
-%%PORTDOCS%%%%DOCSDIR%%/plugins/translate/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/plugins/translate/README
-%%PORTDOCS%%%%DOCSDIR%%/presets.txt
-%%PORTDOCS%%%%DOCSDIR%%/russian_apache.txt
-%%PORTDOCS%%%%DOCSDIR%%/security.txt
-%%PORTDOCS%%%%DOCSDIR%%/themes.txt
-%%PORTDOCS%%%%DOCSDIR%%/translating.txt
-%%PORTDOCS%%%%DOCSDIR%%/translating_help.txt
 %%SQUIRRELDIR%%/class/deliver/Deliver.class.php
 %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php
 %%SQUIRRELDIR%%/class/deliver/Deliver_SMTP.class.php
@@ -1153,28 +1086,6 @@ etc/periodic/daily/111.clean-squirrelmail
 %%SQUIRRELDIR%%/themes/wood_theme.php
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/abook_take
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/administrator
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/bug_report
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/calendar
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/delete_move_next
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters/bulkquery
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/fortune
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/info
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/listcommands
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/mail_fetch
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/newmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/spamcop
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/squirrelspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/translate
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Development
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ReleaseNotes/1.4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ReleaseNotes/1.3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ReleaseNotes/1.2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ReleaseNotes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SQUIRRELDIR%%/themes/css
 @dirrm %%SQUIRRELDIR%%/themes
 @dirrm %%SQUIRRELDIR%%/src