Date: Mon, 12 May 2014 21:17:46 +0100 (BST) From: Tim Bishop <tim@bishnet.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: leeym@FreeBSD.org Subject: ports/189739: [PATCH] sysutils/swapd: update to 1.0.5 Message-ID: <201405122017.s4CKHkAS094789@aberfal.kent.ac.uk> Resent-Message-ID: <201405122130.s4CLU0a1021289@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189739 >Category: ports >Synopsis: [PATCH] sysutils/swapd: update to 1.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 12 21:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Tim Bishop >Release: FreeBSD 10.0-STABLE amd64 >Organization: >Environment: System: FreeBSD aberfal.kent.ac.uk 10.0-STABLE FreeBSD 10.0-STABLE #0 r264471: Wed Apr 16 12:43:29 BST >Description: - Update to 1.0.5 - Stage support - Use new LIB_DEPENDS format Update to 1.0.5 is required to support the new libstatgrab 0.90 API. Until this update is applied this port will be broken. I (tdb@) am happy to handle committing this if approved. Port maintainer (leeym@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.02 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- swapd-1.0.5.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 353892) +++ Makefile (working copy) @@ -2,30 +2,26 @@ # $FreeBSD$ PORTNAME= swapd -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= sysutils -MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/ +MASTER_SITES= http://www.rkeene.org/files/oss/swapd/ MAINTAINER= leeym@FreeBSD.org COMMENT= A daemon that watches free memory and manages swap files -LIB_DEPENDS= statgrab:${PORTSDIR}/devel/libstatgrab +LIB_DEPENDS= libstatgrab.so:${PORTSDIR}/devel/libstatgrab USES= gmake pkgconfig GNU_CONFIGURE= yes USE_RC_SUBR= swapd -MAN5= swapd.conf.5 -MAN8= swapd.8 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${CONFIGURE_SCRIPT} post-install: .for f in swapd_swapon swapd_swapoff - ${INSTALL_SCRIPT} ${FILESDIR}/${f} ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${FILESDIR}/${f} ${STAGEDIR}${PREFIX}/sbin .endfor .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 353892) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (swapd-1.0.3.tar.gz) = 28e61c243268185a60e4012a612c054ebe9fd65215961df5e69fb32735984628 -SIZE (swapd-1.0.3.tar.gz) = 90981 +SHA256 (swapd-1.0.5.tar.gz) = a9c25251ad4b1eb163266cd44969975db5a872be68cf7bca66367d43875ccbc6 +SIZE (swapd-1.0.5.tar.gz) = 94713 Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 353892) +++ files/patch-Makefile.in (working copy) @@ -1,11 +1,22 @@ ---- Makefile.in.orig 2004-10-17 22:05:24.000000000 -0700 -+++ Makefile.in 2007-08-24 09:08:55.000000000 -0700 -@@ -35,6 +35,7 @@ - -$(INSTALL) -d $(mandir)/man8 - -$(INSTALL) -d $(mandir)/man5 - $(INSTALL) -m 755 swapd$(EXEEXT) $(sbindir)/swapd$(EXEEXT) +--- ./Makefile.in.orig 2004-10-18 06:05:24.000000000 +0100 ++++ ./Makefile.in 2013-11-22 22:33:19.141103774 +0000 +@@ -30,11 +30,11 @@ + rm -f Makefile config.h config.status config.log swapd.8 swapd.conf.5 + + install: all +- -$(INSTALL) -d $(sbindir) +- -$(INSTALL) -d $(sysconfdir) +- -$(INSTALL) -d $(mandir)/man8 +- -$(INSTALL) -d $(mandir)/man5 +- $(INSTALL) -m 755 swapd$(EXEEXT) $(sbindir)/swapd$(EXEEXT) - $(INSTALL) -m 644 swapd.conf $(sysconfdir)/swapd.conf -+ $(INSTALL) -m 644 swapd.conf $(sysconfdir)/swapd.conf.sample -+ if [ ! -f "$(sysconfdir)/swapd.conf" ]; then $(INSTALL) -m 644 swapd.conf $(sysconfdir)/swapd.conf; fi - $(INSTALL) -m 644 swapd.8 $(mandir)/man8/swapd.8 - $(INSTALL) -m 644 swapd.conf.5 $(mandir)/man5/swapd.conf.5 +- $(INSTALL) -m 644 swapd.8 $(mandir)/man8/swapd.8 +- $(INSTALL) -m 644 swapd.conf.5 $(mandir)/man5/swapd.conf.5 ++ -$(INSTALL) -d $(DESTDIR)$(sbindir) ++ -$(INSTALL) -d $(DESTDIR)$(sysconfdir) ++ -$(INSTALL) -d $(DESTDIR)$(mandir)/man8 ++ -$(INSTALL) -d $(DESTDIR)$(mandir)/man5 ++ $(INSTALL) -m 755 swapd$(EXEEXT) $(DESTDIR)$(sbindir)/swapd$(EXEEXT) ++ $(INSTALL) -m 644 swapd.conf $(DESTDIR)$(sysconfdir)/swapd.conf.sample ++ $(INSTALL) -m 644 swapd.8 $(DESTDIR)$(mandir)/man8/swapd.8 ++ $(INSTALL) -m 644 swapd.conf.5 $(DESTDIR)$(mandir)/man5/swapd.conf.5 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 353892) +++ files/patch-configure (working copy) @@ -1,24 +1,24 @@ ---- configure.orig 2005-02-18 20:34:16.000000000 -0800 -+++ configure 2010-06-25 00:26:06.000000000 -0700 -@@ -11435,6 +11435,7 @@ - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi -+eval "$as_ac_var=no" - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 - if test `eval echo '${'$as_ac_var'}'` = yes; then -@@ -11535,6 +11536,7 @@ - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi +--- ./configure.orig 2013-10-06 17:11:43.000000000 +0100 ++++ ./configure 2013-11-22 21:48:41.875104078 +0000 +@@ -4850,6 +4850,7 @@ + for ac_func in swapoff + do : + ac_fn_c_check_func "$LINENO" "swapoff" "ac_cv_func_swapoff" ++ac_cv_func_swapoff=no + if test "x$ac_cv_func_swapoff" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SWAPOFF 1 +@@ -4861,6 +4862,7 @@ + + + ac_fn_c_check_func "$LINENO" "swapon" "ac_cv_func_swapon" +ac_cv_func_swapon=no - echo "$as_me:$LINENO: result: $ac_cv_func_swapon" >&5 - echo "${ECHO_T}$ac_cv_func_swapon" >&6 - if test $ac_cv_func_swapon = yes; then -@@ -12170,6 +12172,17 @@ - _ACEOF + if test "x$ac_cv_func_swapon" = xyes; then : + +@@ -5114,6 +5116,17 @@ + $as_echo "#define SWAPD_SWAPOFF_CMDLINE \"/sbin/swapctl -d \\\"%s\\\"\"" >>confdefs.h + ;; + freebsd*) + Index: pkg-plist =================================================================== --- pkg-plist (revision 353892) +++ pkg-plist (working copy) @@ -1,3 +1,5 @@ +man/man5/swapd.conf.5.gz +man/man8/swapd.8.gz sbin/swapd sbin/swapd_swapon sbin/swapd_swapoff --- swapd-1.0.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405122017.s4CKHkAS094789>