pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update tinyproxy to more modern Makefile



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <juraj%lutter.sk@localhost>
Pushed By:	otis
Date:		Tue Jul 23 09:38:14 2019 +0000
Changeset:	cc1ee92399c82abe96691a4f25d5230a6adb902e

Modified Files:
	tinyproxy/Makefile
	tinyproxy/PLIST
	tinyproxy/distinfo
	tinyproxy/patches/patch-src_Makefile.in

Log Message:
Update tinyproxy to more modern Makefile

- Fix Makefile
- Move log and run directories creation from PLIST do Makefile
- Document Makefile.in patch
- Fix distinfo

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc1ee92399c82abe96691a4f25d5230a6adb902e

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

diffstat:
 tinyproxy/Makefile                      | 8 +++++++-
 tinyproxy/PLIST                         | 8 --------
 tinyproxy/distinfo                      | 1 +
 tinyproxy/patches/patch-src_Makefile.in | 5 +++++
 4 files changed, 13 insertions(+), 9 deletions(-)

diffs:
diff --git a/tinyproxy/Makefile b/tinyproxy/Makefile
index 26f3ee93ad..1163e7da85 100644
--- a/tinyproxy/Makefile
+++ b/tinyproxy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.40 2019/05/23 19:23:21 rillig Exp $
 
 DISTNAME=	tinyproxy-1.10.0
-PKGREVISION=    3
+PKGREVISION=    4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tinyproxy/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -48,6 +48,12 @@ SUBST_VARS.docs+=	VARBASE
 
 INSTALLATION_DIRS=	${EGDIR} share/doc/tinyproxy
 
+OWN_DIRS+=		${VARBASE}/log/tinyproxy
+OWN_DIRS_PERMS+=	${VARBASE}/log/tinyproxy ${TINYPROXY_USER} ${TINYPROXY_GROUP} 0755
+
+OWN_DIRS+=		${VARBASE}/run/tinyproxy
+OWN_DIRS_PERMS+=	${VARBASE}/run/tinyproxy ${TINYPROXY_USER} ${TINYPROXY_GROUP} 0755
+
 PLIST_SUBST+=		VARBASE=${VARBASE}
 PLIST_SUBST+=		TINYPROXY_USER=${TINYPROXY_USER:Q}
 PLIST_SUBST+=		TINYPROXY_GROUP=${TINYPROXY_GROUP:Q}
diff --git a/tinyproxy/PLIST b/tinyproxy/PLIST
index f16a21f7e1..abdbaff229 100644
--- a/tinyproxy/PLIST
+++ b/tinyproxy/PLIST
@@ -11,11 +11,3 @@ share/examples/tinyproxy/tinyproxy.conf.default
 share/tinyproxy/debug.html
 share/tinyproxy/default.html
 share/tinyproxy/stats.html
-@exec ${MKDIR} ${VARBASE}/log/tinyproxy || ${TRUE}
-@exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/log/tinyproxy || ${TRUE}
-@exec ${CHMOD} 755 ${VARBASE}/log/tinyproxy || ${TRUE}
-@exec ${MKDIR} ${VARBASE}/run/tinyproxy || ${TRUE}
-@exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/run/tinyproxy || ${TRUE}
-@exec ${CHMOD} 755 ${VARBASE}/run/tinyproxy || ${TRUE}
-@unexec ${RMDIR} ${VARBASE}/log/tinyproxy 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} ${VARBASE}/run/tinyproxy 2>/dev/null || ${TRUE}
diff --git a/tinyproxy/distinfo b/tinyproxy/distinfo
index 6e13b63b09..7e55d028d4 100644
--- a/tinyproxy/distinfo
+++ b/tinyproxy/distinfo
@@ -8,3 +8,4 @@ SHA1 (patch-docs_man5_tinyproxy.conf.txt.in) = 1641f7c44ce84f2ebac6e945760af3ba7
 SHA1 (patch-docs_man8_tinyproxy.txt.in) = 12c43d0f874a8794cbe8da7c702e406e8b10a99b
 SHA1 (patch-etc_Makefile.in) = 05586bae07900c24dd418bddcbf0157ba2b302ef
 SHA1 (patch-etc_tinyproxy.conf.in) = 19481a177119b266034280d8923ea855021d8663
+SHA1 (patch-src_Makefile.in) = 47975fdb8b21b2cf221ef3b5160ba524aabba693
diff --git a/tinyproxy/patches/patch-src_Makefile.in b/tinyproxy/patches/patch-src_Makefile.in
index 0d68e60e58..c1392c9c42 100644
--- a/tinyproxy/patches/patch-src_Makefile.in
+++ b/tinyproxy/patches/patch-src_Makefile.in
@@ -1,5 +1,10 @@
 $NetBSD$
 
+Set pkgsysconfdir to sysconfdir, that is being set to
+$(PREFIX)/etc/$(PACKAGE) from within make process.
+
+This fixes SMF start errors on SunOS.
+
 --- src/Makefile.in.orig	2018-09-01 02:12:08.000000000 +0000
 +++ src/Makefile.in
 @@ -290,7 +290,7 @@ target_vendor = @target_vendor@


Home | Main Index | Thread Index | Old Index