CVS commit: pkgsrc/www/ffproxy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/ffproxy
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sun, 15 Jun 2025 16:55:16 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Jun 15 16:55:16 UTC 2025

Modified Files:
        pkgsrc/www/ffproxy: Makefile PLIST distinfo
        pkgsrc/www/ffproxy/patches: patch-aa
Added Files:
        pkgsrc/www/ffproxy/files: ffproxy.sh

Log Message:
www/ffproxy: fix handliong of configuration files

Files under ${PREFIX}/share/ffproxy/db are configuration files and
should not be overwritten when installing the package.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/ffproxy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ffproxy/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/ffproxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/ffproxy/files/ffproxy.sh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ffproxy/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ffproxy/Makefile
diff -u pkgsrc/www/ffproxy/Makefile:1.5 pkgsrc/www/ffproxy/Makefile:1.6
--- pkgsrc/www/ffproxy/Makefile:1.5     Sun Oct 28 06:30:15 2012
+++ pkgsrc/www/ffproxy/Makefile Sun Jun 15 16:55:15 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2012/10/28 06:30:15 asau Exp $
+# $NetBSD: Makefile,v 1.6 2025/06/15 16:55:15 taca Exp $
 
 DISTNAME=      ffproxy-1.6
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://faith.eu.org/ffproxy/
-PKGREVISION=   1
 
 MAINTAINER=    niklas%noxa.de@localhost
 HOMEPAGE=      http://faith.eu.org/programs.html\#ffproxy
@@ -12,5 +12,28 @@ LICENSE=     gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 
-CONF_FILES=    ${PREFIX}/share/ffproxy/sample.config ${PKG_SYSCONFDIR}/ffproxy.conf
+EGDIR=         share/examples/ffproxy
+FFPDIR=                share/ffproxy
+
+CONFIGS=       access.dyndns access.host access.ip filter.header.add \
+               filter.header.drop filter.header.entry filter.header.match \
+               filter.host.match filter.rheader.drop filter.rheader.entry \
+               filter.rheader.match filter.url.match
+
+CONF_FILES=    ${PREFIX}/${EGDIR}/ffproxy.conf ${PKG_SYSCONFDIR}/ffproxy.conf
+.for f in ${CONFIGS}
+CONF_FILES+=   ${PREFIX}/${EGDIR}/db/${f} ${PREFIX}/${FFPDIR}/db/${f}
+.endfor
+OWN_DIRS+=     ${FFPDIR}/db
+
+RCD_SCRIPTS=                   ffproxy
+
+PLIST_SUBST+=          EGDIR=${EGDIR} FFPDIR=${FFPDIR}
+PRINT_PLIST_AWK+=      /^${EGDIR:S|/|\\/|g}/ \
+                       { gsub(/${EGDIR:S|/|\\/|g}/, "$${EGDIR}") }
+PRINT_PLIST_AWK+=      /^${FFPDIR:S|/|\\/|g}/ \
+                       { gsub(/${FFPDIR:S|/|\\/|g}/, "$${FFPDIR}") }
+
+INSTALLATION_DIRS+=    ${EGDIR}/db
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ffproxy/PLIST
diff -u pkgsrc/www/ffproxy/PLIST:1.2 pkgsrc/www/ffproxy/PLIST:1.3
--- pkgsrc/www/ffproxy/PLIST:1.2        Sun Jun 14 22:00:21 2009
+++ pkgsrc/www/ffproxy/PLIST    Sun Jun 15 16:55:15 2025
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/06/15 16:55:15 taca Exp $
 bin/ffproxy
 man/man5/ffproxy.conf.5
 man/man7/ffproxy.quick.7
 man/man8/ffproxy.8
-share/ffproxy/db/access.dyndns
-share/ffproxy/db/access.host
-share/ffproxy/db/access.ip
-share/ffproxy/db/filter.header.add
-share/ffproxy/db/filter.header.drop
-share/ffproxy/db/filter.header.entry
-share/ffproxy/db/filter.header.match
-share/ffproxy/db/filter.host.match
-share/ffproxy/db/filter.rheader.drop
-share/ffproxy/db/filter.rheader.entry
-share/ffproxy/db/filter.rheader.match
-share/ffproxy/db/filter.url.match
+${EGDIR}/db/access.dyndns
+${EGDIR}/db/access.host
+${EGDIR}/db/access.ip
+${EGDIR}/db/filter.header.add
+${EGDIR}/db/filter.header.drop
+${EGDIR}/db/filter.header.entry
+${EGDIR}/db/filter.header.match
+${EGDIR}/db/filter.host.match
+${EGDIR}/db/filter.rheader.drop
+${EGDIR}/db/filter.rheader.entry
+${EGDIR}/db/filter.rheader.match
+${EGDIR}/db/filter.url.match
+${EGDIR}/ffproxy.conf
 share/ffproxy/html/connect
 share/ffproxy/html/filtered
 share/ffproxy/html/invalid
 share/ffproxy/html/post
 share/ffproxy/html/resolve
-share/ffproxy/sample.config

Index: pkgsrc/www/ffproxy/distinfo
diff -u pkgsrc/www/ffproxy/distinfo:1.6 pkgsrc/www/ffproxy/distinfo:1.7
--- pkgsrc/www/ffproxy/distinfo:1.6     Tue Oct 26 11:29:26 2021
+++ pkgsrc/www/ffproxy/distinfo Sun Jun 15 16:55:15 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:29:26 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/06/15 16:55:15 taca Exp $
 
 BLAKE2s (ffproxy-1.6.tar.gz) = ecaa0a73929129ff236113abfb291fd23a1de8ad5c1ed429ef3012f6351c29a3
 SHA512 (ffproxy-1.6.tar.gz) = cdee483d8b6153f23531e6c2efc9c1369b9fc3b65815f760e0e8edcdc4c4db67946e3a6555a173c4dcc924d90f1e292aceff720fe82135b244f23649d0e57c3f
 Size (ffproxy-1.6.tar.gz) = 77535 bytes
-SHA1 (patch-aa) = 63d861ee3c9307f5eb0ad7e7946a120ef35a78a0
+SHA1 (patch-aa) = 52ad3545a22829375de942c9ed7921142006ec53
 SHA1 (patch-ab) = ae6002a9d65f646877cce59da9b69d6074ac0705
 SHA1 (patch-ac) = 87b7ebc8f76078e2cbe75894b34aa65fb62a6415

Index: pkgsrc/www/ffproxy/patches/patch-aa
diff -u pkgsrc/www/ffproxy/patches/patch-aa:1.2 pkgsrc/www/ffproxy/patches/patch-aa:1.3
--- pkgsrc/www/ffproxy/patches/patch-aa:1.2     Mon Sep 12 16:46:45 2011
+++ pkgsrc/www/ffproxy/patches/patch-aa Sun Jun 15 16:55:16 2025
@@ -1,10 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2011/09/12 16:46:45 taca Exp $
+$NetBSD: patch-aa,v 1.3 2025/06/15 16:55:16 taca Exp $
 
 Stop installing configuration which handled by pkgsrc's pkginstall framework.
 
---- Makefile.in.orig   2006-01-05 11:50:45.000000000 -0700
-+++ Makefile.in        2006-01-05 11:51:59.000000000 -0700
-@@ -62,7 +62,7 @@
+--- Makefile.in.orig   2005-01-05 15:50:10.000000000 +0000
++++ Makefile.in
+@@ -57,12 +57,15 @@ installdirs: mkinstalldirs
+               $(DESTDIR)$(pkgdatadir) \
+               $(DESTDIR)$(pkgdatadir)/db \
+               $(DESTDIR)$(pkgdatadir)/html \
++              $(DESTDIR)$(datadir)/examples \
++              $(DESTDIR)$(datadir)/examples/ffproxy \
++              $(DESTDIR)$(datadir)/examples/ffproxy/db \
+               $(DESTDIR)$(mandir) \
+               $(DESTDIR)$(mandir)/man5 \
                $(DESTDIR)$(mandir)/man7 \
                $(DESTDIR)$(mandir)/man8
  
@@ -13,3 +21,16 @@ Stop installing configuration which hand
  
  install_bin: ffproxy
        $(INSTALL_PROGRAM) ffproxy $(DESTDIR)$(bindir)
+@@ -76,10 +79,10 @@ install_config: conf
+       $(INSTALL_DATA) ffproxy.conf $(DESTDIR)$(sysconfdir)
+ 
+ install_sample: conf
+-      $(INSTALL_DATA) sample.config $(DESTDIR)$(pkgdatadir)
++      $(INSTALL_DATA) ffproxy.conf $(DESTDIR)$(datadir)/examples/ffproxy
+ 
+ install_data:
+-      $(INSTALL_DATA) $(MY_DBFILES) $(DESTDIR)$(pkgdatadir)/db
++      $(INSTALL_DATA) $(MY_DBFILES) $(DESTDIR)$(datadir)/examples/ffproxy/db
+       $(INSTALL_DATA) $(MY_HTMLFILES) $(DESTDIR)$(pkgdatadir)/html
+ 
+ uninstall: uninstall_bin uninstall_man uninstall_sample

Added files:

Index: pkgsrc/www/ffproxy/files/ffproxy.sh
diff -u /dev/null pkgsrc/www/ffproxy/files/ffproxy.sh:1.1
--- /dev/null   Sun Jun 15 16:55:16 2025
+++ pkgsrc/www/ffproxy/files/ffproxy.sh Sun Jun 15 16:55:15 2025
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+
+# PROVIDE: ffproxy
+# REQUIRE: DAEMON LOGIN
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="ffproxy"
+rcvar=$name
+command="@PREFIX@/bin/${name}"
+pidfile="@VARBASE@/run/${name}.pid"
+
+load_rc_config $name
+run_rc_command "$1"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index