From owner-svn-ports-head@FreeBSD.ORG Mon Oct 7 23:13:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9FD2D99E; Mon, 7 Oct 2013 23:13:53 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F5CE2CBE; Mon, 7 Oct 2013 23:13:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r97NDr1R046755; Mon, 7 Oct 2013 23:13:53 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r97NDrnV046752; Mon, 7 Oct 2013 23:13:53 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201310072313.r97NDrnV046752@svn.freebsd.org> From: Matthias Andree Date: Mon, 7 Oct 2013 23:13:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329745 - head/misc/e2fsprogs-libuuid X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 23:13:53 -0000 Author: mandree Date: Mon Oct 7 23:13:52 2013 New Revision: 329745 URL: http://svnweb.freebsd.org/changeset/ports/329745 Log: Convert to staging. Modified: head/misc/e2fsprogs-libuuid/Makefile head/misc/e2fsprogs-libuuid/pkg-plist (contents, props changed) Modified: head/misc/e2fsprogs-libuuid/Makefile ============================================================================== --- head/misc/e2fsprogs-libuuid/Makefile Mon Oct 7 23:13:03 2013 (r329744) +++ head/misc/e2fsprogs-libuuid/Makefile Mon Oct 7 23:13:52 2013 (r329745) @@ -15,7 +15,7 @@ WITHOUT_NLS= yes OPTIONSFILE= # works around optionsNG trouble MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid -USE_GMAKE= yes +USES= gmake USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs @@ -23,17 +23,8 @@ INSTALL_WRKSRC= ${WRKSRC}/lib/uuid FILESDIR= ${.CURDIR}/files USE_RC_SUBR= uuidd -MAN1= uuidgen.1 - -MAN3= uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 uuid_generate.3 \ - uuid_is_null.3 uuid_parse.3 uuid_time.3 uuid_unparse.3 \ - uuid_generate_random.3 uuid_generate_time.3 - -MAN8= uuidd.8 - PKGDIR= ${.CURDIR} -NO_STAGE= yes post-patch:: ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \ -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \ @@ -51,10 +42,9 @@ post-build: cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${GMAKE} check ) post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/misc/uuidgen.1 ${MAN8PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidd ${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/misc/uuidd.8 ${MAN8PREFIX}/man/man8/ - ${MKDIR} /var/run/libuuid + ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/misc/uuidgen.1 ${STAGEDIR}${MAN8PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidd ${STAGEDIR}${PREFIX}/sbin/ + ${INSTALL_MAN} ${WRKSRC}/misc/uuidd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ .include "${MASTERDIR}/Makefile" Modified: head/misc/e2fsprogs-libuuid/pkg-plist ============================================================================== --- head/misc/e2fsprogs-libuuid/pkg-plist Mon Oct 7 23:13:03 2013 (r329744) +++ head/misc/e2fsprogs-libuuid/pkg-plist Mon Oct 7 23:13:52 2013 (r329745) @@ -1,5 +1,3 @@ -@unexec %D/etc/rc.d/uuidd stop >/dev/null 2>&1 || true -@unexec rm -rf /var/run/libuuid >/dev/null 2>&1 || true bin/uuidgen include/uuid/uuid.h lib/libuuid.so.1.2 @@ -7,6 +5,21 @@ lib/libuuid.so.1 lib/libuuid.so lib/libuuid.a libdata/pkgconfig/uuid.pc +man/man1/uuidgen.1.gz +man/man3/uuid.3.gz +man/man3/uuid_clear.3.gz +man/man3/uuid_compare.3.gz +man/man3/uuid_copy.3.gz +man/man3/uuid_generate.3.gz +man/man3/uuid_is_null.3.gz +man/man3/uuid_parse.3.gz +man/man3/uuid_time.3.gz +man/man3/uuid_unparse.3.gz +man/man3/uuid_generate_random.3.gz +man/man3/uuid_generate_time.3.gz +man/man8/uuidd.8.gz sbin/uuidd -@dirrm include/uuid @exec mkdir -p /var/run/libuuid +@dirrm include/uuid +@unexec %D/etc/rc.d/uuidd stop >/dev/null 2>&1 || true +@unexec rmdir /var/run/libuuid >/dev/null 2>&1 || true