Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Oct 2013 23:13:53 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329745 - head/misc/e2fsprogs-libuuid
Message-ID:  <201310072313.r97NDrnV046752@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310072313.r97NDrnV046752>