Stage support and clean up the messy Makefile a little

2 files changed, 118 insertions, 32 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 2ae83379d950..974ca6033aff 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -42,16 +42,11 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
 
-PORTDOCS=	* .htaccess
-
 CONFLICTS=	squirreloutlook-[0-9]*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DATABASE_RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
-.if ${PORT_OPTIONS:MDATABASE}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
@@ -65,22 +60,10 @@ pre-everything::
 .endif
 
 post-patch:
-.ifndef PATCH_DEBUG
-	@${RM} -f \
-		${WRKSRC}/class/deliver/Deliver.class.php.orig \
-		${WRKSRC}/config/config_default.php.orig \
-		${WRKSRC}/functions/global.php.orig \
-		${WRKSRC}/functions/i18n.php.orig \
-		${WRKSRC}/functions/imap_search.php.orig \
-		${WRKSRC}/src/addrbook_search_html.php.orig \
-		${WRKSRC}/src/compose.php.orig
-.endif
 	@${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/ispell|g' \
 		${WRKSRC}/plugins/squirrelspell/sqspell_config.php
 	@${REINPLACE_CMD} -e 's|/usr/bin/fortune|/usr/games/fortune|g' \
 		${WRKSRC}/plugins/fortune/fortune_functions.php
-	@${RM} ${WRKSRC}/plugins/squirrelspell/sqspell_config.php.bak \
-		${WRKSRC}/plugins/fortune/fortune_functions.php.bak
 
 # Rearrange the documentation
 do-build:
@@ -96,27 +79,28 @@ do-build:
 	${MV} plugins/squirrelspell/doc/* doc/plugins/squirrelspell ; \
 	${RM} -f doc/plugins/squirrelspell/index.php ; \
 	${RM} -rf plugins/squirrelspell/doc
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref
 	@${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample
 
+pre-install:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+
 do-install:
-	${MKDIR} ${PREFIX}/etc/periodic/daily
-	${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${PREFIX}/etc/periodic/daily
-	${MKDIR} ${SQUIRRELDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.php ${SQUIRRELDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/configure ${SQUIRRELDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	${MKDIR} ${STAGEDIR}${SQUIRRELDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR}
 .for DIR in class config data functions help images include locale plugins po src themes
-	cd ${WRKSRC} && ${FIND} ${DIR} | ${CPIO} -pdmu --quiet ${SQUIRRELDIR}
+	cd ${WRKSRC} && ${FIND} ${DIR} | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}
 .endfor
-	${CHOWN} -R ${SMUSER}:${SMGROUP} ${SQUIRRELDIR}/data
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${DOCSDIR}
-.endif
+	${CHOWN} -R ${SMUSER}:${SMGROUP} ${STAGEDIR}${SQUIRRELDIR}/data
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist
index e7628d2054ff..998f2d112c59 100644
--- a/mail/squirrelmail/pkg-plist
+++ b/mail/squirrelmail/pkg-plist
@@ -374,6 +374,86 @@ etc/periodic/daily/111.clean-squirrelmail
 %%SQUIRRELDIR%%/themes/techno_blue.php
 %%SQUIRRELDIR%%/themes/turquoise.php
 %%SQUIRRELDIR%%/themes/wood_theme.php
+%%PORTDOCS%%%%DOCSDIR%%/.htaccess
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.themes
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/authentication.txt
+%%PORTDOCS%%%%DOCSDIR%%/ie_ssl.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.php
+%%PORTDOCS%%%%DOCSDIR%%/plugins/README.plugins
+%%PORTDOCS%%%%DOCSDIR%%/plugins/administrator/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/plugins/bug_report/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/calendar/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/delete_move_next/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/demo/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/plugins/demo/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/fortune/README
+%%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/test/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/plugins/test/README
+%%PORTDOCS%%%%DOCSDIR%%/plugins/translate/README
+%%PORTDOCS%%%%DOCSDIR%%/presets.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.10.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.10a.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.11.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.12.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.13.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.15.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.16.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.17.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.18.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.19.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20-RC2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20RC1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.21.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3a.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.7.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.8.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.9.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.9a.txt
+%%PORTDOCS%%%%DOCSDIR%%/russian_apache.txt
+%%PORTDOCS%%%%DOCSDIR%%/security.txt
+%%PORTDOCS%%%%DOCSDIR%%/translating.txt
+%%PORTDOCS%%%%DOCSDIR%%/translating_help.txt
 @dirrm %%SQUIRRELDIR%%/themes/css
 @dirrm %%SQUIRRELDIR%%/themes
 @dirrm %%SQUIRRELDIR%%/src
@@ -418,3 +498,25 @@ etc/periodic/daily/111.clean-squirrelmail
 @dirrmtry %%SQUIRRELDIR%%
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.4
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.3
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.2
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/release_notes_archive
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/translate
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/test
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/squirrelspell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/spamcop
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/newmail
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/mail_fetch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/listcommands
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/info
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/fortune
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters/bulkquery
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/demo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/delete_move_next
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/calendar
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/bug_report
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/administrator
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/plugins
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%