munge: Sync with committed version, fix plist issues

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: munge: Sync with committed version, fix plist issues
From: Jason W. Bacon <bacon%NetBSD.org@localhost>
Date: Wed, 07 Mar 2018 15:19:49 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed Mar 7 09:19:49 2018 -0600
Changeset:	52e5ef1da74239f4c37db3f5b96a4f9cf8d27da6

Modified Files:
	munge/Makefile
	munge/PLIST
	munge/PLIST.FreeBSD
	munge/PLIST.NetBSD
	munge/distinfo
	munge/patches/patch-src_etc_Makefile.in

Log Message:
munge: Sync with committed version, fix plist issues

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

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

diffstat:
 munge/Makefile                          | 20 ++++++++++----------
 munge/PLIST                             |  4 +++-
 munge/PLIST.FreeBSD                     |  2 +-
 munge/PLIST.NetBSD                      |  2 +-
 munge/distinfo                          | 12 ++++++------
 munge/patches/patch-src_etc_Makefile.in | 26 +++++++++++---------------
 6 files changed, 32 insertions(+), 34 deletions(-)

diffs:
diff --git a/munge/Makefile b/munge/Makefile
index 9ffe2f6110..a22ce9df64 100644
--- a/munge/Makefile
+++ b/munge/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/28 09:20:29 wiz Exp $
 
-DISTNAME=	munge-0.5.11
-PKGREVISION=	6
+DISTNAME=	munge-0.5.13
 CATEGORIES=	security
-MASTER_SITES=	http://munge.googlecode.com/files/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dun/}
+GITHUB_RELEASE=	${DISTNAME}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	asau%inbox.ru@localhost
 HOMEPAGE=	https://dun.github.io/munge/
 COMMENT=	Authentication service for creating and validating credentials
 
-USE_TOOLS=		perl pkg-config
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--localstatedir=$(VARBASE)
+USE_TOOLS=	perl pkg-config
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-OWN_DIRS=	$(VARBASE)/lib/munge $(VARBASE)/log/munge $(VARBASE)/run/munge
+OWN_DIRS=	${VARBASE}/lib/munge ${VARBASE}/log/munge ${VARBASE}/run/munge
 
 RCD_SCRIPTS+=	munge
 
diff --git a/munge/PLIST b/munge/PLIST
index 830d9c6806..4ba41142f8 100644
--- a/munge/PLIST
+++ b/munge/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2014/04/25 10:20:06 asau Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/02/28 09:20:29 wiz Exp $
 bin/munge
 bin/remunge
 bin/unmunge
 include/munge.h
 lib/libmunge.la
 lib/pkgconfig/munge.pc
+lib/systemd/system/munge.service
+lib/tmpfiles.d/munge.conf
 man/man1/munge.1
 man/man1/remunge.1
 man/man1/unmunge.1
diff --git a/munge/PLIST.FreeBSD b/munge/PLIST.FreeBSD
index 66b62c5094..c4c2a06778 100644
--- a/munge/PLIST.FreeBSD
+++ b/munge/PLIST.FreeBSD
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.3 2015/12/29 04:04:31 dholland Exp $
+@comment $NetBSD: PLIST.FreeBSD,v 1.4 2018/01/01 22:29:54 rillig Exp $
 share/examples/default/munge
 share/examples/init.d/munge
diff --git a/munge/PLIST.NetBSD b/munge/PLIST.NetBSD
index 236c85914e..0e40819c36 100644
--- a/munge/PLIST.NetBSD
+++ b/munge/PLIST.NetBSD
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2015/12/29 04:04:31 dholland Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.5 2018/02/28 09:20:29 wiz Exp $
 share/examples/default/munge
 share/examples/init.d/munge
diff --git a/munge/distinfo b/munge/distinfo
index a2cc13bb06..f8bb108348 100644
--- a/munge/distinfo
+++ b/munge/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:17:51 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/02/28 09:20:29 wiz Exp $
 
-SHA1 (munge-0.5.11.tar.bz2) = 6939ddabc4bc2b3bacdb8bb2bf24766b666d1c0d
-RMD160 (munge-0.5.11.tar.bz2) = f7908ba980570519dab99f81023201fb0bd3c195
-SHA512 (munge-0.5.11.tar.bz2) = b9d4cd76c4fe605ad67934af48809205de0f0e5fa1a10dd3b6e382da2cb8bc274bd2a8c0d4bc49d1d58155bf008945a584afd0b6e01cc8052aa1d21c8de2815b
-Size (munge-0.5.11.tar.bz2) = 423232 bytes
-SHA1 (patch-src_etc_Makefile.in) = 11a79fd9d5e5b3da76a3c637c3e7cf394acbbe5e
+SHA1 (munge-0.5.13.tar.xz) = bcb0b89e44c5c0ec21f4bcfaacb4493b82aace61
+RMD160 (munge-0.5.13.tar.xz) = 77c6e9df935ddc1ffe6cd481e015f59e2f74e1b7
+SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
+Size (munge-0.5.13.tar.xz) = 389952 bytes
+SHA1 (patch-src_etc_Makefile.in) = 5790d36ff17167f4f71b452737688d99ea10c05a
diff --git a/munge/patches/patch-src_etc_Makefile.in b/munge/patches/patch-src_etc_Makefile.in
index cfda949961..1313821dc9 100644
--- a/munge/patches/patch-src_etc_Makefile.in
+++ b/munge/patches/patch-src_etc_Makefile.in
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_etc_Makefile.in,v 1.3 2013/12/08 22:34:10 joerg Exp $
+$NetBSD: patch-src_etc_Makefile.in,v 1.4 2018/02/28 09:20:29 wiz Exp $
 
---- src/etc/Makefile.in.orig	2013-08-27 18:35:31.000000000 +0000
+--- src/etc/Makefile.in.orig	2017-09-26 21:57:53.000000000 +0000
 +++ src/etc/Makefile.in
-@@ -242,6 +242,7 @@ sbindir = @sbindir@
+@@ -298,6 +298,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
-+sysconfexampledir = $(pkgdatadir)/examples
++sysconfexampledir = $(prefix)/share/examples
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -465,18 +466,18 @@ distclean-local::
+@@ -581,15 +582,15 @@ munge.tmpfiles.conf: munge.tmpfiles.conf
  
  install-data-local:
  	test -d "/etc/rc.d/init.d" \
@@ -21,6 +21,7 @@ $NetBSD: patch-src_etc_Makefile.in,v 1.3 2013/12/08 22:34:10 joerg Exp $
  	  $(INSTALL) -m 0755 -d "$(DESTDIR)$${INITDIR}"; \
  	  $(INSTALL) -m 0755 \
  	    "$(builddir)/munge.init" "$(DESTDIR)$${INITDIR}/munge"
+ 	:
  	test -d "/etc/sysconfig" \
 -	    && CONFDIR="$(sysconfdir)/sysconfig" \
 -	    || CONFDIR="$(sysconfdir)/default"; \
@@ -28,16 +29,11 @@ $NetBSD: patch-src_etc_Makefile.in,v 1.3 2013/12/08 22:34:10 joerg Exp $
 +	    || CONFDIR="$(sysconfexampledir)/default"; \
  	  $(INSTALL) -m 0755 -d "$(DESTDIR)$${CONFDIR}"; \
  	  $(INSTALL) -m 0644 \
- 	    "$(srcdir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge"
--	if test -d "$(libdir)/pkgconfig"; then \
-+	if test -d "${DESTDIR}$(libdir)/pkgconfig"; then \
- 	  $(INSTALL) -m 0755 \
- 	    -d "$(DESTDIR)$(libdir)/pkgconfig"; \
- 	  $(INSTALL) -m 0644 \
-@@ -500,8 +501,8 @@ install-data-local:
- 	    "$(srcdir)/munge-tmpfiles.conf" \
- 	    "$(DESTDIR)$(prefix)/lib/tmpfiles.d/munge.conf"; \
- 	fi
+ 	    "$(builddir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge"
+@@ -610,8 +611,8 @@ install-data-local:
+ 	  "$(builddir)/munge.tmpfiles.conf" \
+ 	  "$(DESTDIR)$${TMPFILESDIR}/munge.conf"
+ 	:
 -	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)"
 -	$(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfdir)/munge"
 +	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)"
Prev by Date: gnucash-devel: use upstream patch to fix Makefile install
Next by Date: munge: Another adjustment to examples dir in PLIST.*
Previous by Thread: gnucash-devel: use upstream patch to fix Makefile install
Next by Thread: munge: Another adjustment to examples dir in PLIST.*
Indexes:
Home | Main Index | Thread Index | Old Index