svn commit: r339389 - in head/sysutils/logrotate: . files

[Guido Falsi]

Author: madpilot
Date: Fri Jan 10 23:04:07 2014
New Revision: 339389
URL: http://svnweb.freebsd.org/changeset/ports/339389

Log:
  - Update to 3.8.7 [1]
  
  While here [2]:
  
  - Use new LIB_DEPENDS format
  - Convert to USES=gmake
  - Convert to staging
  - Fix configuration file handling
  
  PR:		ports/185615 [1]
  Submitted by:	Balazs Nagy <js at iksz.hu> (maintainer)
  Approved by:	implicit portmgr@ blanket approval [2]

Modified:
  head/sysutils/logrotate/Makefile
  head/sysutils/logrotate/distinfo
  head/sysutils/logrotate/files/patch-Makefile
  head/sysutils/logrotate/pkg-plist   (contents, props changed)

Modified: head/sysutils/logrotate/Makefile
==============================================================================
--- head/sysutils/logrotate/Makefile	Fri Jan 10 22:24:49 2014	(r339388)
+++ head/sysutils/logrotate/Makefile	Fri Jan 10 23:04:07 2014	(r339389)
@@ -1,30 +1,25 @@
 # Created by: Yuan-Chen Cheng <ycheng at sinica.edu.tw>
 # $FreeBSD$
 
-PORTNAME=		logrotate
-PORTVERSION=		3.8.5
-CATEGORIES=		sysutils
-MASTER_SITES=		https://fedorahosted.org/releases/l/o/logrotate/
+PORTNAME=	logrotate
+PORTVERSION=	3.8.7
+CATEGORIES=	sysutils
+MASTER_SITES=	https://fedorahosted.org/releases/l/o/logrotate/
 
-MAINTAINER=		js at iksz.hu
-COMMENT=		Daemon to rotate, compress, remove, and mail system log files
+MAINTAINER=	js at iksz.hu
+COMMENT=	Daemon to rotate, compress, remove, and mail system log files
 
-LIB_DEPENDS=		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 
 PATCH_STRIP=		-p1
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV=	"BASEDIR=${PREFIX}"
 CPP=		${CC} -E
 
-MAN5=		logrotate.conf.5
-MAN8=		logrotate.8
-MANCOMPRESSED=	no
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${SED} -e 's|__PREFIX__|${PREFIX}|' \
-		< ${FILESDIR}/logrotate.conf.sample > ${PREFIX}/etc/logrotate.conf.sample
-	@${INSTALL_DATA} ${FILESDIR}/syslog.sample ${EXAMPLESDIR}
+		< ${FILESDIR}/logrotate.conf.sample > ${STAGEDIR}${PREFIX}/etc/logrotate.conf.sample
+	@${INSTALL_DATA} ${FILESDIR}/syslog.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/logrotate/distinfo
==============================================================================
--- head/sysutils/logrotate/distinfo	Fri Jan 10 22:24:49 2014	(r339388)
+++ head/sysutils/logrotate/distinfo	Fri Jan 10 23:04:07 2014	(r339389)
@@ -1,2 +1,2 @@
-SHA256 (logrotate-3.8.5.tar.gz) = 6b695bffeb54ed6f6c9a560780231a55c3548a24b96cb06f33b84f8cea600079
-SIZE (logrotate-3.8.5.tar.gz) = 57818
+SHA256 (logrotate-3.8.7.tar.gz) = f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64
+SIZE (logrotate-3.8.7.tar.gz) = 58898

Modified: head/sysutils/logrotate/files/patch-Makefile
==============================================================================
--- head/sysutils/logrotate/files/patch-Makefile	Fri Jan 10 22:24:49 2014	(r339388)
+++ head/sysutils/logrotate/files/patch-Makefile	Fri Jan 10 23:04:07 2014	(r339389)
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-10-04 03:59:14.000000000 -0400
-+++ Makefile	2012-12-02 21:44:52.000000000 -0500
-@@ -71,6 +71,13 @@
+--- Makefile.orig	2013-06-10 13:29:16.000000000 +0200
++++ Makefile	2014-01-10 15:03:37.479613407 +0100
+@@ -81,6 +81,13 @@
      LOADLIBES += -L$(BASEDIR)/lib -Wl,-R,$(BASEDIR)/lib
  endif
  
@@ -14,3 +14,16 @@
  ifneq ($(POPT_DIR),)
      CFLAGS += -I$(POPT_DIR)
      LOADLIBES += -L$(POPT_DIR)
+@@ -148,9 +155,9 @@
+ 	$(INSTALL) $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \
+ 	$(INSTALL) $(MAN5) $(PREFIX)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"` 0644 bin bin; \
+ 	else if [ "$(OS_NAME)" = FreeBSD ]; then \
+-	$(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
+-	$(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+-	$(BSD_INSTALL_MAN) $(MAN5) $(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
++	$(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR); \
++	$(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
++	$(BSD_INSTALL_MAN) $(MAN5) $(DESTDIR)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
+ 	else \
+ 	$(INSTALL) -m 755 $(PROG) $(PREFIX)$(BINDIR); \
+ 	$(INSTALL) -m 644 $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \

Modified: head/sysutils/logrotate/pkg-plist
==============================================================================
--- head/sysutils/logrotate/pkg-plist	Fri Jan 10 22:24:49 2014	(r339388)
+++ head/sysutils/logrotate/pkg-plist	Fri Jan 10 23:04:07 2014	(r339389)
@@ -1,4 +1,8 @@
 sbin/logrotate
+ at unexec if cmp -s %D/etc/logrotate.conf.sample %D/etc/logrotate.conf; then rm -f %D/etc/logrotate.conf; fi
 etc/logrotate.conf.sample
+ at exec if [ ! -f %D/etc/logrotate.conf ]; then cp -p %D/%F %B/logrotate.conf; fi
 %%EXAMPLESDIR%%/syslog.sample
+man/man5/logrotate.conf.5.gz
+man/man8/logrotate.8.gz
 @dirrm %%EXAMPLESDIR%%