cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename libuuid to libe2fs-uuid and move it back to ${LOCALBASE}/lib.

Browse Source 
Rename the uuid(3) manpage to e2fs-uuid(3). Merge subpackackages back
into one single package.

ok and prodded by ajacoutot@
ok landry@
This commit is contained in:
kili 2010-04-03 11:53:58 +00:00
parent 0bf80f5e3f
commit 834c9f8bd5
10 changed files with 97 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sysutils/e2fsprogs/Makefile
View File

@ -1,26 +1,20 @@
# $OpenBSD: Makefile,v 1.16 2010/04/02 21:19:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2010/04/03 11:53:58 kili Exp $
# $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
COMMENT-main= utilities to manipulate ext2 filesystems
COMMENT-uuid= unique id generator library
COMMENT= utilities to manipulate ext2 filesystems
V= 1.41.4
DISTNAME= e2fsprogs-${V}
PKGNAME-main= ${DISTNAME}p2
PKGNAME-uuid= e2fs-uuid-${V}p2
CATEGORIES-uuid= devel
CATEGORIES= sysutils
DISTNAME= e2fsprogs-1.41.4
PKGNAME= ${DISTNAME}p3
CATEGORIES= sysutils devel
SHARED_LIBS= blkid 0.0 \
e2p 3.0 \
ext2fs 3.0 \
ext2fs_com_err 3.0 \
ss 3.0 \
uuid 2.0
e2fs-uuid 0.0
HOMEPAGE= http://e2fsprogs.sourceforge.net/
MULTI_PACKAGES= -main -uuid
# GPLv2/LGPLv2/BSD/MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -43,19 +37,13 @@ MAKE_FLAGS= LIBblkid_VERSION=${LIBblkid_VERSION} \
LIBext2fs_VERSION=${LIBext2fs_VERSION} \
LIBext2fs_com_err_VERSION=${LIBext2fs_com_err_VERSION} \
LIBss_VERSION=${LIBss_VERSION} \
LIBuuid_VERSION=${LIBuuid_VERSION}
LIB_DEPENDS-main= lib/uuid/uuid::${BUILD_PKGPATH},-uuid \
${MODGETTEXT_LIB_DEPENDS}
LIBe2fs-uuid_VERSION=${LIBe2fs-uuid_VERSION}
INSTALL_TARGET= install install-libs
post-install:
cd ${PREFIX}/sbin && mv fsck fsck_ext2fs
cd ${PREFIX}/man/man8 && mv fsck.8 fsck_ext2fs.8
${INSTALL_DATA_DIR} ${PREFIX}/lib/uuid
mv ${PREFIX}/lib/libuuid.* ${PREFIX}/lib/uuid
cd ${PREFIX}/man/man3 && mv uuid.3 e2fs-uuid.3
mv ${PREFIX}/lib/pkgconfig/uuid.pc ${PREFIX}/lib/pkgconfig/e2fs-uuid.pc
if [ -f ${PREFIX}/lib/uuid/libuuid.so.${LIBuuid_VERSION} ]; then \
ln -s uuid/libuuid.so.${LIBuuid_VERSION} ${PREFIX}/lib; \
fi
.include <bsd.port.mk>

26
sysutils/e2fsprogs/patches/patch-MCONFIG_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
$OpenBSD: patch-MCONFIG_in,v 1.3 2010/04/03 11:53:58 kili Exp $
--- MCONFIG.in.orig Sat Nov 15 18:17:22 2008
+++ MCONFIG.in Sat Feb 21 17:00:02 2009
@@ -70,29 +70,35 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
+++ MCONFIG.in Fri Apr 2 21:44:32 2010
@@ -70,34 +70,40 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
# Library definitions
#
LIB = $(top_builddir)/lib
@ -15,14 +15,15 @@ $OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
+LIBCOM_ERR = -L$(LIB) -lext2fs_com_err
+LIBE2P = -L$(LIB) -le2p
+LIBEXT2FS = -L$(LIB) -lext2fs
+LIBUUID = -L$(LIB) -luuid @SOCKET_LIB@
+LIBUUID = -L$(LIB) -le2fs-uuid @SOCKET_LIB@
+LIBBLKID = -L$(LIB) -lblkid $(LIBUUID)
LIBINTL = @LIBINTL@
DEPLIBSS = $(LIB)/libss@LIB_EXT@
-DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+DEPLIBE2P= $(LIB)/libe2p@LIB_EXT@
+DEPLIBEXT2FS= $(LIB)/libext2fs@LIB_EXT@
+DEPLIBCOM_ERR= $(LIB)/libext2fs_com_err@LIB_EXT@
DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+DEPLIBUUID = $(LIB)/libe2fs-uuid@LIB_EXT@
DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
@ -30,13 +31,15 @@ $OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
+STATIC_LIBCOM_ERR = $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@
-STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@
+STATIC_LIBUUID = $(LIB)/libe2fs-uuid@STATIC_LIB_EXT@ @SOCKET_LIB@
STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_LIBUUID)
+DEPSTATIC_LIBEXT2FS= $(LIB)/libext2fs@STATIC_LIB_EXT@
+DEPSTATIC_LIBE2P= $(LIB)/libe2p@STATIC_LIB_EXT@
+DEPSTATIC_LIBCOM_ERR= $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@
DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
-DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
+DEPSTATIC_LIBUUID = $(LIB)/libe2fs-uuid@STATIC_LIB_EXT@
DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@
@ -44,4 +47,11 @@ $OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
+PROFILED_LIBCOM_ERR = $(LIB)/libext2fs_com_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@
-PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@
+PROFILED_LIBUUID = $(LIB)/libe2fs-uuid@PROFILED_LIB_EXT@ @SOCKET_LIB@
PROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@ $(PROFILED_LIBUUID)
-DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
+DEPPROFILED_LIBUUID = $(LIB)/libe2fs-uuid@PROFILED_LIB_EXT@
DEPPROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@
# An include directive pointing to a directory holding enough linux-like

46
sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in
View File

@ -1,17 +1,30 @@
$OpenBSD: patch-lib_uuid_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
$OpenBSD: patch-lib_uuid_Makefile_in,v 1.3 2010/04/03 11:53:58 kili Exp $
--- lib/uuid/Makefile.in.orig Tue Feb 19 05:33:10 2008
+++ lib/uuid/Makefile.in Sun Feb 22 10:55:09 2009
@@ -41,8 +41,8 @@ SRCS= $(srcdir)/clear.c \
LIBRARY= libuuid
+++ lib/uuid/Makefile.in Fri Apr 2 21:35:50 2010
@@ -38,18 +38,18 @@ SRCS= $(srcdir)/clear.c \
$(srcdir)/unparse.c \
$(srcdir)/uuid_time.c
-LIBRARY= libuuid
+LIBRARY= libe2fs-uuid
LIBDIR= uuid
-ELF_VERSION = 1.2
-ELF_SO_VERSION = 1
+ELF_VERSION = $(LIBuuid_VERSION)
+ELF_SO_VERSION = $(LIBuuid_VERSION)
ELF_IMAGE = libuuid
-ELF_IMAGE = libuuid
+ELF_VERSION = $(LIBe2fs-uuid_VERSION)
+ELF_SO_VERSION = $(LIBe2fs-uuid_VERSION)
+ELF_IMAGE = libe2fs-uuid
ELF_MYDIR = uuid
ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS =
BSDLIB_VERSION = 1.1
-BSDLIB_IMAGE = libuuid
+BSDLIB_IMAGE = libe2fs-uuid
BSDLIB_MYDIR = uuid
BSDLIB_INSTALL_DIR = $(root_libdir)
@@ -60,8 +60,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
@ -106,9 +119,9 @@ $OpenBSD: patch-lib_uuid_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- @for i in $(SMANPAGES); do \
+ $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
+ $(INSTALL_DATA) libe2fs-uuid.a $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
@ -130,3 +143,16 @@ $OpenBSD: patch-lib_uuid_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \
@@ -175,9 +155,9 @@ distclean:: clean
#
# Hack to parallel makes recognize dependencies correctly.
#
-../../lib/libuuid.a: libuuid.a
-../../lib/libuuid.so: image
-../../lib/libuuid.dylib: image
+../../lib/libe2fs-uuid.a: libe2fs-uuid.a
+../../lib/libe2fs-uuid.so: image
+../../lib/libe2fs-uuid.dylib: image
$(OBJS): subdirs

20
sysutils/e2fsprogs/patches/patch-lib_uuid_uuid_pc_in
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-lib_uuid_uuid_pc_in,v 1.1 2009/06/02 17:35:23 landry Exp $
--- lib/uuid/uuid.pc.in.orig Mon Jun 1 18:24:37 2009
+++ lib/uuid/uuid.pc.in Mon Jun 1 18:25:29 2009
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@libdir@/uuid
includedir=@includedir@
Name: uuid
$OpenBSD: patch-lib_uuid_uuid_pc_in,v 1.2 2010/04/03 11:53:58 kili Exp $
--- lib/uuid/uuid.pc.in.orig Tue Oct 7 16:22:39 2008
+++ lib/uuid/uuid.pc.in Fri Apr 2 22:50:48 2010
@@ -8,4 +8,4 @@ Description: Universally unique id library
Version: @E2FSPROGS_VERSION@
Requires:
Cflags: -I${includedir}/uuid
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -le2fs-uuid

1
sysutils/e2fsprogs/pkg/DESCR-main → sysutils/e2fsprogs/pkg/DESCR
View File

@ -3,3 +3,4 @@ Set of utilities and library to manipulate ext2 filesystems.
* mkfs for ext2/ext3
* tune2fs
* dumpe2fs
* libe2fs-uuid (renamed from libuuid to avoid conflicts)

5
sysutils/e2fsprogs/pkg/DESCR-uuid
View File

@ -1,5 +0,0 @@
unique id library, normally part of e2fsprogs, moved into its separate
package and its separate directory so that it does not conflict with
another libuuid.
Be sure to link with -L${PREFIX}/lib/uuid to get the right one.

3
sysutils/e2fsprogs/pkg/PFRAG.shared-main → sysutils/e2fsprogs/pkg/PFRAG.shared
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/03/15 19:59:31 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.5 2010/04/03 11:53:58 kili Exp $
@lib lib/libblkid.so.${LIBblkid_VERSION}
@lib lib/libe2fs-uuid.so.${LIBe2fs-uuid_VERSION}
@lib lib/libe2p.so.${LIBe2p_VERSION}
@lib lib/libext2fs.so.${LIBext2fs_VERSION}
@lib lib/libext2fs_com_err.so.${LIBext2fs_com_err_VERSION}

3
sysutils/e2fsprogs/pkg/PFRAG.shared-uuid
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared-uuid,v 1.1 2007/01/07 19:13:49 espie Exp $
@lib lib/libuuid.so.${LIBuuid_VERSION}
@lib lib/uuid/libuuid.so.${LIBuuid_VERSION}

24
sysutils/e2fsprogs/pkg/PLIST-main → sysutils/e2fsprogs/pkg/PLIST
View File

@ -1,8 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.6 2010/04/02 21:19:07 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/04/03 11:53:58 kili Exp $
@conflict e2fs-uuid-*
@pkgpath sysutils/e2fsprogs,-main
@pkgpath sysutils/e2fsprogs,-uuid
@bin bin/chattr
@comment bin/compile_et
@bin bin/lsattr
bin/mk_cmds
@bin bin/uuidgen
include/blkid/
include/blkid/blkid.h
include/blkid/blkid_types.h
@ -23,10 +27,13 @@ include/ext2fs/tdb.h
include/ss/
include/ss/ss.h
include/ss/ss_err.h
include/uuid/
include/uuid/uuid.h
%%SHARED%%
@info info/libext2fs.info
@bin lib/e2initrd_helper
lib/libblkid.a
lib/libe2fs-uuid.a
lib/libe2p.a
lib/libext2fs.a
lib/libext2fs_com_err.a
@ -34,6 +41,7 @@ lib/libss.a
lib/pkgconfig/
lib/pkgconfig/blkid.pc
lib/pkgconfig/com_err.pc
lib/pkgconfig/e2fs-uuid.pc
lib/pkgconfig/e2p.pc
lib/pkgconfig/ext2fs.pc
lib/pkgconfig/ss.pc
@ -41,8 +49,20 @@ lib/pkgconfig/ss.pc
@comment man/man1/compile_et.1
@man man/man1/lsattr.1
@man man/man1/mk_cmds.1
@man man/man1/uuidgen.1
@man man/man3/com_err.3
@man man/man3/e2fs-uuid.3
@man man/man3/libblkid.3
@man man/man3/uuid_clear.3
@man man/man3/uuid_compare.3
@man man/man3/uuid_copy.3
@man man/man3/uuid_generate.3
@man man/man3/uuid_generate_random.3
@man man/man3/uuid_generate_time.3
@man man/man3/uuid_is_null.3
@man man/man3/uuid_parse.3
@man man/man3/uuid_time.3
@man man/man3/uuid_unparse.3
@man man/man5/e2fsck.conf.5
@man man/man5/mke2fs.conf.5
@man man/man8/badblocks.8
@ -69,6 +89,7 @@ lib/pkgconfig/ss.pc
@man man/man8/mklost+found.8
@man man/man8/resize2fs.8
@man man/man8/tune2fs.8
@man man/man8/uuidd.8
@bin sbin/badblocks
@bin sbin/blkid
@bin sbin/debugfs
@ -93,6 +114,7 @@ lib/pkgconfig/ss.pc
@bin sbin/mklost+found
@bin sbin/resize2fs
@bin sbin/tune2fs
@bin sbin/uuidd
share/et/
share/et/et_c.awk
share/et/et_h.awk

23
sysutils/e2fsprogs/pkg/PLIST-uuid
View File

@ -1,23 +0,0 @@
@comment $OpenBSD: PLIST-uuid,v 1.4 2010/04/02 21:19:07 ajacoutot Exp $
@bin bin/uuidgen
include/uuid/
include/uuid/uuid.h
lib/pkgconfig/
lib/pkgconfig/e2fs-uuid.pc
lib/uuid/
lib/uuid/libuuid.a
%%SHARED%%
@man man/man1/uuidgen.1
@comment @man man/man3/uuid.3
@man man/man3/uuid_clear.3
@man man/man3/uuid_compare.3
@man man/man3/uuid_copy.3
@man man/man3/uuid_generate.3
@man man/man3/uuid_generate_random.3
@man man/man3/uuid_generate_time.3
@man man/man3/uuid_is_null.3
@man man/man3/uuid_parse.3
@man man/man3/uuid_time.3
@man man/man3/uuid_unparse.3
@man man/man8/uuidd.8
@bin sbin/uuidd