CVS commit: pkgsrc/net/3proxy

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Feb 20 13:01:31 UTC 2018

Modified Files:
        pkgsrc/net/3proxy: Makefile distinfo
Added Files:
        pkgsrc/net/3proxy/patches: patch-man_3proxy.8 patch-man_3proxy.cfg.3

Log Message:
Cosmetic and PATH fixing

- Use SUBST_VARS instead of SUBST_SED (thanks to leot@)
- Fix hardcoded PATH in manpages


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/3proxy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/3proxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/3proxy/patches/patch-man_3proxy.8 \
    pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3

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

Modified files:

Index: pkgsrc/net/3proxy/Makefile
diff -u pkgsrc/net/3proxy/Makefile:1.11 pkgsrc/net/3proxy/Makefile:1.12
--- pkgsrc/net/3proxy/Makefile:1.11     Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/Makefile  Tue Feb 20 13:01:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/02/19 21:25:46 triaxx Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/20 13:01:30 triaxx Exp $
 #
 
 DISTNAME=      3proxy-0.8.11
@@ -30,10 +30,10 @@ INSTALLATION_DIRS=  sbin ${PKGMANDIR}/man
 SUBST_CLASSES+=                cfg
 SUBST_STAGE.cfg=       pre-install
 SUBST_MESSAGE.cfg=     Adjusting config sample file.
-SUBST_FILES.cfg=       cfg/3proxy.cfg.sample
-SUBST_SED.cfg=         -e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.cfg+=                -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_SED.cfg+=                -e "s|@VARBASE@|${VARBASE}|g"
+SUBST_FILES.cfg=       cfg/3proxy.cfg.sample man/3proxy.8 man/3proxy.cfg.3
+SUBST_VARS.cfg+=       PREFIX
+SUBST_VARS.cfg+=       PKG_SYSCONFDIR
+SUBST_VARS.cfg+=       VARBASE
 
 # We install only 3proxy and its man pages.  There are several other
 # binaries which we don't install, because the 3proxy executable

Index: pkgsrc/net/3proxy/distinfo
diff -u pkgsrc/net/3proxy/distinfo:1.6 pkgsrc/net/3proxy/distinfo:1.7
--- pkgsrc/net/3proxy/distinfo:1.6      Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/distinfo  Tue Feb 20 13:01:30 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: distinfo,v 1.7 2018/02/20 13:01:30 triaxx Exp $
 
 SHA1 (3proxy-0.8.11.tgz) = 0bef5462e558db2d86cce92f8dc916b494dd7bde
 RMD160 (3proxy-0.8.11.tgz) = 19f0d2903dcad680f5442a49d962cac1f874cae4
@@ -10,3 +10,5 @@ SHA1 (patch-ad) = 8081f363dbf0232e5d1db1
 SHA1 (patch-ae) = 467ad84a16ee806da1bbc3d297434bd31a25bb27
 SHA1 (patch-cfg_3proxy.cfg.sample) = c8db82b11704547ec26c67059e71231c5b667135
 SHA1 (patch-Makefile.unix) = bcaf278e55d954ecc758a0f01c7e35f8d7a7fca2
+SHA1 (patch-man_3proxy.8) = ea00a3c99c201fc87efb1270bfaab13a4e2f9c75
+SHA1 (patch-man_3proxy.cfg.3) = 52fb754e7241c10612e13bca66127072732b56f1

Added files:

Index: pkgsrc/net/3proxy/patches/patch-man_3proxy.8
diff -u /dev/null pkgsrc/net/3proxy/patches/patch-man_3proxy.8:1.1
--- /dev/null   Tue Feb 20 13:01:31 2018
+++ pkgsrc/net/3proxy/patches/patch-man_3proxy.8        Tue Feb 20 13:01:30 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-man_3proxy.8,v 1.1 2018/02/20 13:01:30 triaxx Exp $
+
+Fix hardcoded PATH.
+
+--- man/3proxy.8.orig  2016-01-23 16:09:23.000000000 +0000
++++ man/3proxy.8
+@@ -84,7 +84,7 @@ directory). Under Unix, if no config fil
+ configuration from stdin. It makes it possible to use 3proxy.cfg file as
+ executable script just by setting +x mode and adding
+ .br
+-#!/usr/local/3proxy/3proxy
++#!@PREFIX@/bin/3proxy
+ .br
+ as a first line in 3proxy.cfg
+ .TP
+@@ -133,7 +133,7 @@ Web admin service can also be used to re
+ wget to automate this task.
+ .SH FILES
+ .TP
+-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
++.I "@PKG_SYSCONFDIR@/3proxy/3proxy.cfg (3proxy.cfg)"
+ .BR 3proxy
+ configuration file
+ .SH BUGS
Index: pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3
diff -u /dev/null pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3:1.1
--- /dev/null   Tue Feb 20 13:01:31 2018
+++ pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3    Tue Feb 20 13:01:30 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-man_3proxy.cfg.3,v 1.1 2018/02/20 13:01:30 triaxx Exp $
+
+Fix hardcoded PATH.
+
+--- man/3proxy.cfg.3.orig      2017-10-19 14:25:42.000000000 +0000
++++ man/3proxy.cfg.3
+@@ -32,7 +32,7 @@ Good practice is to quote any argument y
+  File inclusion:
+ .br
+  You can include file by using $FILENAME macro (replace FILENAME with a path
+-to file, for example $/usr/local/etc/3proxy/conf.incl or 
++to file, for example $@PKG_SYSCONFDIR@/3proxy/conf.incl or 
+  $"c:\\Program Files\\3proxy\\include.cfg" Quotation is
+ required in last example because path contains space character. 
+ For included file <CR> (end of line characters) is treated as space character