- USES=libtool pathfix tar:bzip2

- Set localstatedir in CONFIGURE_ARGS instead of using a patch
- Install pkgconfig file
- Fix pkg-plist for directories under /var

4 files changed, 25 insertions, 31 deletions

diff --git a/security/munge/Makefile b/security/munge/Makefile
index c86718d72c82..da59534bd18e 100644
--- a/security/munge/Makefile
+++ b/security/munge/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	munge
 PORTVERSION=	0.5.11
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GOOGLE_CODE
 
@@ -12,10 +13,16 @@ COMMENT=	Authentication service for creating and validating credentials
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		perl5
+CONFIGURE_ARGS=	--localstatedir=/var
+PLIST_SUB=	RESETPREFIX=${PREFIX}
+USES=		libtool pathfix perl5 tar:bzip2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	munged
 
+post-install:
+	${RM} -r ${STAGEDIR}${PREFIX}/etc/default
+	${RM} -r ${STAGEDIR}${PREFIX}/etc/init.d
+	${RM} -r ${STAGEDIR}${ETCDIR}
+
 .include <bsd.port.mk>
diff --git a/security/munge/files/patch-configure b/security/munge/files/patch-configure
deleted file mode 100644
index 32d4ea989d57..000000000000
--- a/security/munge/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2012-03-18 03:31:24.960241537 +0600
-+++ configure	2012-03-18 03:31:41.879241019 +0600
-@@ -952,7 +952,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
diff --git a/security/munge/files/patch-src-Makefile.in b/security/munge/files/patch-src-Makefile.in
deleted file mode 100644
index 7d5cd280dcdd..000000000000
--- a/security/munge/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2013-11-15 02:53:07.000000000 +0600
-+++ src/Makefile.in	2013-11-15 02:53:15.000000000 +0600
-@@ -284,7 +284,6 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
--	etc \
- 	libcommon \
- 	libmissing \
- 	libmunge \
diff --git a/security/munge/pkg-plist b/security/munge/pkg-plist
index e0ddab9d7c9f..9b15c0360904 100644
--- a/security/munge/pkg-plist
+++ b/security/munge/pkg-plist
@@ -1,13 +1,13 @@
 @stopdaemon munged
-include/munge.h
+bin/munge
 bin/remunge
 bin/unmunge
-bin/munge
-lib/libmunge.la
-lib/libmunge.so.2
+include/munge.h
 lib/libmunge.a
 lib/libmunge.so
-sbin/munged
+lib/libmunge.so.2
+lib/libmunge.so.2.0.0
+libdata/pkgconfig/munge.pc
 man/man1/munge.1.gz
 man/man1/remunge.1.gz
 man/man1/unmunge.1.gz
@@ -28,6 +28,14 @@ man/man3/munge_enum_str_to_int.3.gz
 man/man3/munge_strerror.3.gz
 man/man7/munge.7.gz
 man/man8/munged.8.gz
-@unexec rm %D/var/run/munge 2>&1 >/dev/null || true
-@unexec rm %D/var/log/munge 2>&1 >/dev/null || true
-@unexec rm %D/var/lib/munge 2>&1 >/dev/null || true
+sbin/munged
+@cwd /var
+@exec mkdir -p %D/lib
+@exec mkdir -p -m 711 %D/lib/munge
+@exec mkdir -p -m 700 %D/log/munge
+@exec mkdir -p %D/run/munge
+@dirrmtry run/munge
+@dirrmtry log/munge
+@dirrmtry lib/munge
+@dirrmtry lib
+@cwd %%RESETPREFIX%%