This PR contains the following: 1. PATCH: an update to the sysutils/e2fsprogs port to remove shared libraries that conflict with ossp-uuid or Kerberos e2p and to remove the uuidgen program 2. SHAR: a new misc/e2fsprogs-libuuid port to install the uuid library formerly installed by e2fsprogs (used by audio/marlin, devel/upnp*) 3. PATCH: updates to audio/marlin, devel/upnp* to update dependency locations 4. PATCH: update to misc/ossp-uuid to adjust the CONFLICTS line This all aims to reduce the footprint of the e2fsprogs port and resolve the conflict between e2fsprogs and Kerberos and ossp-uuid. I am not sure if we need /usr/ports/MOVED entries for libuuid. Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # misc/e2fsprogs-libuuid/ # misc/e2fsprogs-libuuid/Makefile # misc/e2fsprogs-libuuid/pkg-descr # misc/e2fsprogs-libuuid/pkg-plist # echo c - misc/e2fsprogs-libuuid/ mkdir -p misc/e2fsprogs-libuuid/ > /dev/null 2>&1 echo x - misc/e2fsprogs-libuuid/Makefile sed 's/^X//' >misc/e2fsprogs-libuuid/Makefile << 'END-of-misc/e2fsprogs-libuuid/Makefile' X# New ports collection makefile for: e2fsprogs X# Date created: 3 July 2001 X# Whom: Maxim Sobolev <sobomax@FreeBSD.org> X# X# $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.26 2005/07/04 10:09:14 novel Exp $ X# X XPORTREVISION= 0 XCATEGORIES= misc devel XPKGNAMESUFFIX= -libuuid X XMAINTAINER= matthias.andree@gmx.de XCOMMENT= UUID library from e2fsprogs package X XCONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck --disable-e2initrd-helper X XWITHOUT_NLS= yes XMASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs XMAKE_ARGS= LIB_SUBDIRS=lib/uuid XINSTALLS_SHLIB= yes XNO_FILTER_SHLIBS= yes XALL_TARGET= libs XINSTALL_TARGET= install install-shlibs XINSTALL_WRKSRC= ${WRKSRC}/lib/uuid X XMAN3= 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 \ X uuid_generate_random.3 uuid_generate_time.3 X XPKGDIR= ${.CURDIR} X Xpre-build: X ${MKDIR} ${WRKSRC}/lib/uuid/elfshared X X.include "${MASTERDIR}/Makefile" END-of-misc/e2fsprogs-libuuid/Makefile echo x - misc/e2fsprogs-libuuid/pkg-descr sed 's/^X//' >misc/e2fsprogs-libuuid/pkg-descr << 'END-of-misc/e2fsprogs-libuuid/pkg-descr' XUUID library from the e2fsprogs package. X XWWW: http://e2fsprogs.sourceforge.net/ END-of-misc/e2fsprogs-libuuid/pkg-descr echo x - misc/e2fsprogs-libuuid/pkg-plist sed 's/^X//' >misc/e2fsprogs-libuuid/pkg-plist << 'END-of-misc/e2fsprogs-libuuid/pkg-plist' Xinclude/uuid/uuid.h Xlib/libuuid.so.1.2 Xlib/libuuid.so.1 Xlib/libuuid.so Xlib/libuuid.a Xlibdata/pkgconfig/uuid.pc END-of-misc/e2fsprogs-libuuid/pkg-plist exit
Responsible Changed From-To: freebsd-ports-bugs->mnag I'll take it.
We need a conflicts line in e2fsprogs-libuuid: CONFLICTS= ossp-uuid-[0-9]* Please add before committing. Thanks. -- Matthias Andree <matthias.andree@gmx.de>
This is the missing pkg-plist patch for sysutils/e2fsprogs: --- a/ports/sysutils/e2fsprogs/pkg-plist Mon Jul 4 12:09:14 2005 +++ b/ports/sysutils/e2fsprogs/pkg-plist Thu Jan 26 10:46:00 2006 @@ -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/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 @@ %%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 -- Matthias Andree
State Changed From-To: open->closed Committed. Thanks!