* audio/marlin, devel/upnp, devel/upnp104

Update dependency to misc/e2fsprogs-libuuid
Bump PORTREVISION

* misc/e2fsprogs-libuuid

Add new port:

UUID library from the e2fsprogs package

* misc/Makefile

Add entry to misc/e2fsprogs-libuuid

* misc/ossp-uuid

Add CONFLICTS to misc/e2fsprogs-libuuid

* sysutils/e2fsprogs

Change to a master port
Remove conflict with misc/ossp-uuid
Remove uuid part
Bump PORTREVISION

PR:		92356
Submitted by:	Matthias Andree <matthias.andree@gmx.de>

2 files changed, 21 insertions, 86 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 61cdecbefa21..5c98a97fa282 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -7,26 +7,21 @@
 
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.38
-PORTREVISION=	1
-CATEGORIES=	sysutils
+PORTREVISION?=	2
+CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	matthias.andree@gmx.de
-COMMENT=	Utilities and library to manipulate ext2/ext3 filesystems
+MAINTAINER?=	matthias.andree@gmx.de
+COMMENT?=	Utilities and library to manipulate ext2/ext3 filesystems
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 .endif
 
 PATCH_STRIP=	-p1
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-INSTALL_TARGET=	install install-libs
-INSTALLS_SHLIB=	yes
-NO_FILTER_SHLIBS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
+CONFIGURE_ARGS?=	--disable-fsck --disable-e2initrd-helper "--with-ldopts=-L${LOCALBASE}/lib"
 CONFIGURE_ENV+=	CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
@@ -35,16 +30,12 @@ PLIST_SUB=	NLS="@comment "
 MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.a  ../lib/libuuid.a ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
 PLIST_SUB=	NLS=""
 .endif
+INSTALLS_SHLIB=	yes
 
-CONFLICTS=	ossp-uuid-[0-9]*
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
+.if !defined(MASTERDIR)
+SUB_FILES=	pkg-message
 
-MAN1=	chattr.1 lsattr.1 uuidgen.1 compile_et.1 mk_cmds.1
-MAN3=	uuid.3 uuid_clear.3 com_err.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 \
-	libblkid.3
+MAN1=	chattr.1 lsattr.1
 MAN8=	badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \
 	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
 	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \
@@ -62,30 +53,35 @@ pre-everything::
 post-extract:
 	${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -E -e 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
 		${WRKSRC}/lib/*/Makefile.in
+	@: # disable uuidgen
+	${REINPLACE_CMD} \
+		-e 's/^\(UPROGS.*\) uuidgen\(.*\)/\1\2/' \
+		-e 's/^\(UMANPAGES.*\) uuidgen.1\(.*\)/\1\2/' \
+		${WRKSRC}/misc/Makefile.in
 
-pre-install:
-	${RM} -f ${PKGMESSAGE}
-	${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
-
+.if ${MASTERDIR} == ${.CURDIR}
 post-build:
 .if !defined(WITHOUT_NLS)
-	cd ${WRKSRC}/po && ${GMAKE} update-gmo
+	cd ${WRKSRC}/po && ${MAKE} update-gmo
 .endif
-	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
-	cd ${WRKSRC}/tests && ${GMAKE} check
+	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s -static ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
+	cd ${WRKSRC}/tests && ${MAKE} check
 
 post-install:
 	${RM} ${PREFIX}/sbin/filefrag
 	${RM} ${PREFIX}/man/man8/filefrag.8
+	${RM} ${PREFIX}/info/libext2fs.info.gz
 	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 45494b608a70..c5260d187089 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -1,54 +1,5 @@
 bin/chattr
-bin/compile_et
 bin/lsattr
-bin/mk_cmds
-bin/uuidgen
-include/blkid/blkid.h
-include/blkid/blkid_types.h
-include/e2p/e2p.h
-include/et/com_err.h
-include/ext2fs/bitops.h
-include/ext2fs/ext2_err.h
-include/ext2fs/ext2_ext_attr.h
-include/ext2fs/ext2_fs.h
-include/ext2fs/ext2_io.h
-include/ext2fs/ext2_types.h
-include/ext2fs/ext2fs.h
-include/ss/ss.h
-include/ss/ss_err.h
-include/uuid/uuid.h
-info/libext2fs.info.gz
-lib/e2initrd_helper
-lib/libblkid.a
-lib/libblkid.so.1.0
-lib/libblkid.so.1
-lib/libblkid.so
-lib/libcom_err.a
-lib/libcom_err.so.2.1
-lib/libcom_err.so.2
-lib/libcom_err.so
-lib/libe2p.a
-lib/libe2p.so
-lib/libe2p.so.2
-lib/libe2p.so.2.3
-lib/libext2fs.a
-lib/libext2fs.so
-lib/libext2fs.so.2
-lib/libext2fs.so.2.4
-libdata/pkgconfig/blkid.pc
-libdata/pkgconfig/com_err.pc
-libdata/pkgconfig/e2p.pc
-libdata/pkgconfig/ext2fs.pc
-libdata/pkgconfig/ss.pc
-libdata/pkgconfig/uuid.pc
-lib/libss.a
-lib/libss.so.2.0
-lib/libss.so.2
-lib/libss.so
-lib/libuuid.a
-lib/libuuid.so
-lib/libuuid.so.1
-lib/libuuid.so.1.2
 sbin/badblocks
 sbin/blkid
 sbin/debugfs
@@ -67,10 +18,6 @@ sbin/mkfs.ext3
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs
-share/et/et_c.awk
-share/et/et_h.awk
-share/ss/ct_c.awk
-share/ss/ct_c.sed
 %%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
@@ -82,11 +29,3 @@ share/ss/ct_c.sed
 %%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%@unexec for i in cs de es fr it nl pl rw sv tr ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done
-@dirrm share/ss
-@dirrm share/et
-@dirrm include/uuid
-@dirrm include/ss
-@dirrm include/ext2fs
-@dirrm include/et
-@dirrm include/e2p
-@dirrm include/blkid