From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 15:32:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2015930; Tue, 28 Jan 2014 15:32:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9D8D3183C; Tue, 28 Jan 2014 15:32:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SFW6r6041733; Tue, 28 Jan 2014 15:32:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SFW6qd041731; Tue, 28 Jan 2014 15:32:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401281532.s0SFW6qd041731@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 28 Jan 2014 15:32:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341597 - head/textproc/htdig X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 15:32:06 -0000 Author: mat Date: Tue Jan 28 15:32:05 2014 New Revision: 341597 URL: http://svnweb.freebsd.org/changeset/ports/341597 QAT: https://qat.redports.org/buildarchive/r341597/ Log: Support staging. Sponsored by: Absolight Modified: head/textproc/htdig/Makefile head/textproc/htdig/pkg-plist Modified: head/textproc/htdig/Makefile ============================================================================== --- head/textproc/htdig/Makefile Tue Jan 28 15:30:02 2014 (r341596) +++ head/textproc/htdig/Makefile Tue Jan 28 15:32:05 2014 (r341597) @@ -23,46 +23,28 @@ CONFIGURE_ARGS= --with-config-dir=${PREF --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 +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 Modified: head/textproc/htdig/pkg-plist ============================================================================== --- head/textproc/htdig/pkg-plist Tue Jan 28 15:30:02 2014 (r341596) +++ head/textproc/htdig/pkg-plist Tue Jan 28 15:32:05 2014 (r341597) @@ -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%%