diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2014-01-10 23:04:07 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2014-01-10 23:04:07 +0000 |
commit | cf8b938045f9db7aabd6f3d2ebb9dc6c5ad3eb7e (patch) | |
tree | c2501c519c7837d6d7eeb6a5afbdc5f2b3118e96 /sysutils/logrotate | |
parent | c76ccf16d7ff70cf910d30ab1ec24fc51013721e (diff) | |
download | ports-cf8b938045f9db7aabd6f3d2ebb9dc6c5ad3eb7e.tar.gz ports-cf8b938045f9db7aabd6f3d2ebb9dc6c5ad3eb7e.zip |
- 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@iksz.hu> (maintainer)
Approved by: implicit portmgr@ blanket approval [2]
Notes
Notes:
svn path=/head/; revision=339389
Diffstat (limited to 'sysutils/logrotate')
-rw-r--r-- | sysutils/logrotate/Makefile | 27 | ||||
-rw-r--r-- | sysutils/logrotate/distinfo | 4 | ||||
-rw-r--r-- | sysutils/logrotate/files/patch-Makefile | 19 | ||||
-rw-r--r-- | sysutils/logrotate/pkg-plist | 4 |
4 files changed, 33 insertions, 21 deletions
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile index 1ceb41b47e9a..9a51270d8b59 100644 --- a/sysutils/logrotate/Makefile +++ b/sysutils/logrotate/Makefile @@ -1,30 +1,25 @@ # Created by: Yuan-Chen Cheng <ycheng@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@iksz.hu -COMMENT= Daemon to rotate, compress, remove, and mail system log files +MAINTAINER= js@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> diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo index 0b1eac41a750..f69c39b555b9 100644 --- a/sysutils/logrotate/distinfo +++ b/sysutils/logrotate/distinfo @@ -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 diff --git a/sysutils/logrotate/files/patch-Makefile b/sysutils/logrotate/files/patch-Makefile index 9afe3008752e..fcfcdbe8c5dc 100644 --- a/sysutils/logrotate/files/patch-Makefile +++ b/sysutils/logrotate/files/patch-Makefile @@ -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); \ diff --git a/sysutils/logrotate/pkg-plist b/sysutils/logrotate/pkg-plist index 28cfa27f56e0..d513e2e9361e 100644 --- a/sysutils/logrotate/pkg-plist +++ b/sysutils/logrotate/pkg-plist @@ -1,4 +1,8 @@ sbin/logrotate +@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 +@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%% |