diff options
author | nork <nork@FreeBSD.org> | 2002-11-27 13:35:52 +0000 |
---|---|---|
committer | nork <nork@FreeBSD.org> | 2002-11-27 13:35:52 +0000 |
commit | 7d065ed002ee19521aa936fe1b02b7f2573c2c5e (patch) | |
tree | 1c56ffc4b2d1291b0fe7c7243cac04c7a3003003 /www/privoxy | |
parent | 429044178eb9777c61b9aae41f3cfabd5bc38167 (diff) | |
download | FreeBSD-ports-7d065ed002ee19521aa936fe1b02b7f2573c2c5e.zip FreeBSD-ports-7d065ed002ee19521aa936fe1b02b7f2573c2c5e.tar.gz |
o make install in port's Makefile.
o add new pkg-message.
o NOPORTDOCS support.
o set up minimum configuration.
Submitted by: John von Essen <john@essenz.com> (maintainer)
Submitted by: Lars Eggert <larse@ISI.EDU>
Reviewed by: John von Essen <john@essenz.com> (maintainer)
Diffstat (limited to 'www/privoxy')
-rw-r--r-- | www/privoxy/Makefile | 32 | ||||
-rw-r--r-- | www/privoxy/files/patch-GNUmakefile.in | 97 | ||||
-rw-r--r-- | www/privoxy/pkg-message.in | 10 | ||||
-rw-r--r-- | www/privoxy/pkg-plist | 34 |
4 files changed, 57 insertions, 116 deletions
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index e7e7fde..499a229 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -16,6 +16,8 @@ MAINTAINER= john@essenz.com WRKSRC= ${WRKDIR}/privoxy-3.0.0-stable +PKGMESSAGE= ${WRKDIR}/pkg-message + USE_GMAKE= yes USE_AUTOCONF= yes USE_REINPLACE= yes @@ -25,10 +27,36 @@ MAKEFILE= GNUmakefile MAN1= privoxy.1 post-patch: - @${REINPLACE_CMD} -e 's,/usr/local,$${PREFIX},' \ - ${WRKSRC}/GNUmakefile.in + ${REINPLACE_CMD} \ + -e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \ + -e 's,^\(logdir\) \.,\1 /tmp,' \ + -e 's,^\(actionsfile standard\),#\1,' \ + -e 's,^\(actionsfile user\),#\1,' \ + ${WRKSRC}/config pre-configure: @(cd ${WRKSRC}; autoheader${USE_AUTOCONF_VER}) +pre-install: + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + ${PKGDIR}/pkg-message.in > ${PKGMESSAGE} + +do-install: + @${MKDIR} ${PREFIX}/etc/privoxy/templates + @${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin + @${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates +.for file in config default.action default.filter trust + @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/privoxy +.endfor + @${INSTALL_MAN} ${WRKSRC}/privoxy.1 ${MANPREFIX}/man/man1 +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/privoxy-manual + @if [ -d ${WRKSRC}/doc/webserver/user-manual ]; then \ + ${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${PREFIX}/share/doc/privoxy-manual; \ + fi +.endif + +post-install: + @${CAT} ${PKGMESSAGE} + .include <bsd.port.mk> diff --git a/www/privoxy/files/patch-GNUmakefile.in b/www/privoxy/files/patch-GNUmakefile.in deleted file mode 100644 index 49e7bbe..0000000 --- a/www/privoxy/files/patch-GNUmakefile.in +++ /dev/null @@ -1,97 +0,0 @@ ---- GNUmakefile.in.orig Fri Aug 23 05:22:40 2002 -+++ GNUmakefile.in Fri Nov 22 11:58:04 2002 -@@ -51,10 +51,10 @@ - # Directories for "make install" - ############################################################################# - --DEST = @prefix@ --CONFDEST = @prefix@@sysconfdir@ --SBIN_DEST = @prefix@@sbindir@ --MAN_DEST = @prefix@@mandir@ -+DEST = /usr/local -+CONFDEST = /usr/local/etc/privoxy -+SBIN_DEST = /usr/local/sbin -+MAN_DEST = /usr/local/man/man1 - DOK_WEB_USEM=doc/webserver/user-manual - - ############################################################################# -@@ -67,9 +67,9 @@ - GZIP_PROG = gzip - #INSTALL = cp -f - INSTALL = @INSTALL@ --INSTALL_P = -m 0750 -g @GROUP@ -o @USER@ -b --INSTALL_T = -m 0640 -g @GROUP@ -o @USER@ -b --INSTALL_D = -m 0750 -g @GROUP@ -o @USER@ -d -+INSTALL_P = -m 0750 -g wheel -o root -b -+INSTALL_T = -m 0640 -g wheel -o root -b -+INSTALL_D = -m 0750 -g wheel -o root -d - LD = @CC@ - RM = rm -f - STRIP_PROG = strip -@@ -95,8 +95,8 @@ - DOC_STATUS = @DOC_STATUS@ - - #User Group paras --USER = @USER@ --GROUP = @GROUP@ -+USER = root -+GROUP = wheel - - # Program to do LF->CRLF - # -@@ -963,42 +963,26 @@ - etags $(SRCS) $(HDRS) - - install: all -- @$(ECHO) "***************************************************"; \ -- $(ECHO) "*** ***"; \ -- $(ECHO) "*** WARNING ***"; \ -- $(ECHO) "*** ***"; \ -- $(ECHO) "*** The install target is very broken and ***"; \ -- $(ECHO) "*** should not be used. For the time being, ***"; \ -- $(ECHO) "*** run from the build dir, install manually, ***"; \ -- $(ECHO) "*** or use a binary package. Sorry. ***"; \ -- $(ECHO) "*** ***"; \ -- $(ECHO) "***************************************************"; \ -- $(ECHO) "Type \"yes i am sure\" if you are sure that you"; \ -- $(ECHO) -n "really want to proceed with the broken install: "; \ -- read answer; \ -- if [ "$$answer" != "yes i am sure" ]; then exit 1; fi -- -- # FIXME! - - $(STRIP_PROG) $(PROGRAM) - $(INSTALL) $(INSTALL_D) $(SBIN_DEST) -- $(INSTALL) $(INSTALL_D) $(DEST)/user-manual -+ $(INSTALL) $(INSTALL_D) $(DEST)/privoxy-manual - $(INSTALL) $(INSTALL_D) $(CONFDEST)/templates -- $(INSTALL) $(INSTALL_D) $(DEST)/$(DOK_WEB_USEM) - $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST) -- if [ -d "$(DOK_WEB_USEM)" ]; then $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[a-z]* $(DEST)/$(DOK_WEB_USEM); fi -+ if [ -d "$(DOK_WEB_USEM)" ]; then $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[a-z]* $(DEST)/privoxy-manual; fi - $(INSTALL) $(INSTALL_T) templates/[a-z]* $(CONFDEST)/templates - $(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST) -- # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly -- # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz -- $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy -- --coffee: -- @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\ -- 239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\ -- 13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\ -- 214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\ -- 193,51,228,11,1,0,0);'|zcat -+ $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz -+ @$(ECHO) "***********************************************************" -+ @$(ECHO) "** Before running privoxy you must modify the file **" -+ @$(ECHO) "** /usr/local/etc/privoxy/config **" -+ @$(ECHO) "** **" -+ @$(ECHO) "** Start privoxy with: **" -+ @$(ECHO) "** /usr/local/sbin/privoxy /usr/local/etc/privoxy/config **" -+ @$(ECHO) "** **" -+ @$(ECHO) "** For documentation see: **" -+ @$(ECHO) "** /usr/local/privoxy-manual/ or 'man privoxy' **" -+ @$(ECHO) "***********************************************************" - - ############################################################################# - diff --git a/www/privoxy/pkg-message.in b/www/privoxy/pkg-message.in new file mode 100644 index 0000000..7b127e5 --- /dev/null +++ b/www/privoxy/pkg-message.in @@ -0,0 +1,10 @@ +*********************************************************** +** Before running privoxy you must modify the file ** +** %%PREFIX%%/etc/privoxy/config ** +** ** +** Start privoxy with: ** +** %%PREFIX%%/sbin/privoxy %%PREFIX%%/etc/privoxy/config ** +** ** +** For documentation see: ** +** %%PREFIX%%/share/doc/privoxy-manual or 'man privoxy' ** +*********************************************************** diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist index 86436374..8ba4d14 100644 --- a/www/privoxy/pkg-plist +++ b/www/privoxy/pkg-plist @@ -1,3 +1,4 @@ +sbin/privoxy etc/privoxy/config etc/privoxy/default.action etc/privoxy/default.filter @@ -35,22 +36,21 @@ etc/privoxy/templates/show-version etc/privoxy/templates/toggle etc/privoxy/templates/toggle-mini etc/privoxy/templates/untrusted -privoxy-manual/actions-file.html -privoxy-manual/configuration.html -privoxy-manual/filter-file.html -privoxy-manual/introduction.html -privoxy-manual/startup.html -privoxy-manual/appendix.html -privoxy-manual/contact.html -privoxy-manual/index.html -privoxy-manual/quickstart.html -privoxy-manual/templates.html -privoxy-manual/config.html -privoxy-manual/copyright.html -privoxy-manual/installation.html -privoxy-manual/seealso.html -privoxy-manual/upgradersnote.html -sbin/privoxy +%%PORTDOCS%%share/doc/privoxy-manual/actions-file.html +%%PORTDOCS%%share/doc/privoxy-manual/configuration.html +%%PORTDOCS%%share/doc/privoxy-manual/filter-file.html +%%PORTDOCS%%share/doc/privoxy-manual/introduction.html +%%PORTDOCS%%share/doc/privoxy-manual/startup.html +%%PORTDOCS%%share/doc/privoxy-manual/appendix.html +%%PORTDOCS%%share/doc/privoxy-manual/contact.html +%%PORTDOCS%%share/doc/privoxy-manual/index.html +%%PORTDOCS%%share/doc/privoxy-manual/quickstart.html +%%PORTDOCS%%share/doc/privoxy-manual/templates.html +%%PORTDOCS%%share/doc/privoxy-manual/config.html +%%PORTDOCS%%share/doc/privoxy-manual/copyright.html +%%PORTDOCS%%share/doc/privoxy-manual/installation.html +%%PORTDOCS%%share/doc/privoxy-manual/seealso.html +%%PORTDOCS%%share/doc/privoxy-manual/upgradersnote.html +%%PORTDOCS%%@dirrm share/doc/privoxy-manual @dirrm etc/privoxy/templates @dirrm etc/privoxy -@dirrm privoxy-manual |