2 files changed, 37 insertions, 104 deletions

diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index d3d61add725f..a1df325a58cc 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -23,46 +23,28 @@ CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
 		--with-image-dir=${PREFIX}/www/icons/htdig \
 		--with-image-url-prefix=/icons/htdig \
 		--with-ssl
-
-MAN1=		htdig.1 htdig-pdfparser.1 htdump.1 htfuzzy.1 htload.1 \
-		htmerge.1 htnotify.1 htpurge.1 htsearch.1 htstat.1 rundig.1
-
-MAN8=		htdigconfig.8
+USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_DEFAULT=	APACHE
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+APACHE_USE=	APACHE=22+
+APACHE_CONFIGURE_ON=	--with-apache=${LOCALBASE}/sbin
+APACHE_PLIST_DIRSTRY=	www/cgi-bin www/data www/icons
 
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE=	22+
-CONFIGURE_ARGS+=	--with-apache=${LOCALBASE}/sbin
-.include "${PORTSDIR}/Mk/bsd.apache.mk"
-PLIST_DIRSTRY+=	www/cgi-bin www/data www/icons
-.endif
+PORTDOCS=	*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
 
-pre-install:
-.if exists(${PREFIX}/etc/htdig/htdig.conf)
-	${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.old
-.endif
-
 post-install:
-	@${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.sample
-.if exists(${PREFIX}/etc/htdig/htdig.conf.old)
-	${MV} ${PREFIX}/etc/htdig/htdig.conf.old ${PREFIX}/etc/htdig/htdig.conf
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/html
+	@${MV} ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ChangeLog ChangeLog.0 README STATUS
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in *.html *.gif
-	@${INSTALL_DATA} ${WRKSRC}/htdoc/${f} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/htdoc/${f} ${STAGEDIR}${DOCSDIR}/html
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
index eda4e9b5c5c8..d36f41fd30f6 100644
--- a/textproc/htdig/pkg-plist
+++ b/textproc/htdig/pkg-plist
@@ -11,10 +11,12 @@ bin/htnotify
 bin/htpurge
 bin/htstat
 bin/rundig
-etc/htdig/HtFileType-magic.mime
-etc/htdig/cookies.txt
-etc/htdig/htdig.conf.sample
-etc/htdig/mime.types
+%%ETCDIR%%/HtFileType-magic.mime
+%%ETCDIR%%/cookies.txt
+@unexec if cmp -s %D/%%ETCDIR%%/htdig.conf.sample %D/%%ETCDIR%%/htdig.conf; then rm -f %D/%%ETCDIR%%/htdig.conf; fi
+%%ETCDIR%%/htdig.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/htdig.conf ] ; then cp -p %D/%F %B/htdig.conf; fi
+%%ETCDIR%%/mime.types
 include/htdig/Configuration.h
 include/htdig/Connection.h
 include/htdig/DB2_db.h
@@ -155,6 +157,18 @@ lib/htdig_db/libhtdb-3.2.0.so
 lib/htdig_db/libhtdb.a
 lib/htdig_db/libhtdb.la
 lib/htdig_db/libhtdb.so
+man/man1/htdig-pdfparser.1.gz
+man/man1/htdig.1.gz
+man/man1/htdump.1.gz
+man/man1/htfuzzy.1.gz
+man/man1/htload.1.gz
+man/man1/htmerge.1.gz
+man/man1/htnotify.1.gz
+man/man1/htpurge.1.gz
+man/man1/htsearch.1.gz
+man/man1/htstat.1.gz
+man/man1/rundig.1.gz
+man/man8/htdigconfig.8.gz
 %%DATADIR%%/common/bad_words
 %%DATADIR%%/common/english.0
 %%DATADIR%%/common/english.aff
@@ -199,78 +213,15 @@ www/icons/htdig/star.gif
 www/icons/htdig/star.png
 www/icons/htdig/star_blank.gif
 www/icons/htdig/star_blank.png
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/STATUS
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RELEASE.html
-%%PORTDOCS%%%%DOCSDIR%%/html/THANKS.html
-%%PORTDOCS%%%%DOCSDIR%%/html/TODO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/all.html
-%%PORTDOCS%%%%DOCSDIR%%/html/attrs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/attrs_head.html
-%%PORTDOCS%%%%DOCSDIR%%/html/attrs_tail.html
-%%PORTDOCS%%%%DOCSDIR%%/html/author.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bdot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_blocks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname_head.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname_tail.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog_head.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog_tail.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_general.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_types.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cf_variables.html
-%%PORTDOCS%%%%DOCSDIR%%/html/config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/confindex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/confmenu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/contents.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/htdig.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/htdig.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htdig_big.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/htdump.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htfuzzy.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htload.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htmerge.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htnotify.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htpurge.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_form.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_general.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_method.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_selectors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hts_templates.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htsearch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htstat.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/isp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ma_menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mailarchive.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mailing.html
-%%PORTDOCS%%%%DOCSDIR%%/html/main.html
-%%PORTDOCS%%%%DOCSDIR%%/html/meta.html
-%%PORTDOCS%%%%DOCSDIR%%/html/notification.html
-%%PORTDOCS%%%%DOCSDIR%%/html/require.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rundig.html
-%%PORTDOCS%%%%DOCSDIR%%/html/running.html
-%%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/up.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/upgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/uses.html
-%%PORTDOCS%%%%DOCSDIR%%/html/where.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/htdig
-@dirrm include/htdig_db
-@dirrm lib/htdig
-@dirrm lib/htdig_db
-@dirrm www/icons/htdig
-@dirrmtry %%DATADIR%%/common
+@dirrmtry www/icons/htdig
+@dirrmtry www/icons
+@dirrmtry www/data
+@dirrmtry www/cgi-bin
 @dirrmtry %%DATADIR%%/database
+@dirrmtry %%DATADIR%%/common
 @dirrmtry %%DATADIR%%
-@dirrmtry etc/htdig
+@dirrmtry lib/htdig_db
+@dirrmtry lib/htdig
+@dirrmtry include/htdig_db
+@dirrmtry include/htdig
+@dirrmtry %%ETCDIR%%