svn commit: r453195 - in head: security/krb5-113 security/krb5-114 security/krb5-115 security/krb5-devel sysutils/e2fsprogs sysutils/e2fsprogs/files sysutils/fusefs-ext2
Matthias Andree
mandree at FreeBSD.org
Mon Oct 30 16:55:28 UTC 2017
Author: mandree
Date: Mon Oct 30 16:55:26 2017
New Revision: 453195
URL: https://svnweb.freebsd.org/changeset/ports/453195
Log:
Reconcile e2fsprogs ./. krb5-* conflicts.
* Move conflicting e2fsprogs headers & libs into .../e2fsprogs/... subdirs.
* Move conflicting awk scripts into ${DATADIR}.
* Rename and patch compile_et to e2fsprogs-compile_et.
* Remove conflict markers (from e2fsprogs and krb5-*).
* Add CPPFLAGS/LDFLAGS to sysutils/fusefs-ext2, including
--rpath setting.
While here, also:
* sort pkg-plist and files/unwanted
* use FUSEFS_CONFIGURE_ENABLE=fuse2fs to prevent e2fsprogs from picking up
fusefs (implies --disable-fuse2fs if the option remains disabled)
* add --without-included-gettext to CONFIGURE_ARGS just to be on the safe
side.
And of course, bump PORTREVISION to 3 in e2fsprogs. Since other ports
do not change files or runtime behaviour, their PORTREVISION remains
untouched.
Modified:
head/security/krb5-113/Makefile
head/security/krb5-114/Makefile
head/security/krb5-115/Makefile
head/security/krb5-devel/Makefile
head/sysutils/e2fsprogs/Makefile
head/sysutils/e2fsprogs/files/unwanted
head/sysutils/e2fsprogs/pkg-plist
head/sysutils/fusefs-ext2/Makefile
Modified: head/security/krb5-113/Makefile
==============================================================================
--- head/security/krb5-113/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/security/krb5-113/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -22,7 +22,7 @@ DEPRECATED= EOL twelve months after releas
EXPIRATION_DATE= 2017-12-02
CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[45]-[0-9]* \
- krb5-1.[0-9]* krbt5-devel-* e2fsprogs-[0-9]*
+ krb5-1.[0-9]* krbt5-devel-*
KERBEROSV_URL= http://web.mit.edu/kerberos/
USE_PERL5= build
Modified: head/security/krb5-114/Makefile
==============================================================================
--- head/security/krb5-114/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/security/krb5-114/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -18,7 +18,7 @@ COMMENT= MIT implementation of RFC 4120 network authe
LICENSE= MIT
CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[35]-[0-9]* \
- krb5-1.[0-9]* krb5-devel-* e2fsprogs-[0-9]*
+ krb5-1.[0-9]* krb5-devel-*
KERBEROSV_URL= http://web.mit.edu/kerberos/
USE_PERL5= build
Modified: head/security/krb5-115/Makefile
==============================================================================
--- head/security/krb5-115/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/security/krb5-115/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -18,7 +18,7 @@ COMMENT= MIT implementation of RFC 4120 network authe
LICENSE= MIT
CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[34]-[0-9]* \
- krb5-1.[0-9]* krb5-devel-* e2fsprogs-[0-9]*
+ krb5-1.[0-9]* krb5-devel-*
KERBEROSV_URL= http://web.mit.edu/kerberos/
USE_PERL5= build
Modified: head/security/krb5-devel/Makefile
==============================================================================
--- head/security/krb5-devel/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/security/krb5-devel/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -22,7 +22,7 @@ USE_GITHUB= yes
GH_TAGNAME= ${HASH}
CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[345]-[0-9]* \
- krb5-1.[0-9]* e2fsprogs-[0-9]*
+ krb5-1.[0-9]*
KERBEROSV_URL= http://web.mit.edu/kerberos/
USE_PERL5= build
Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/sysutils/e2fsprogs/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -3,7 +3,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.43.7
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -18,8 +18,6 @@ LICENSE_DISTFILES_GPLv2= ${DISTNAME}${EXTRACT_SUFX}
PORTSCOUT= ignore # cannot handle the version in the directory
-CONFLICTS_INSTALL= krb5-[0-9d]*
-
.if !defined(MASTERDIR)
BROKEN_aarch64= fails to link: missing sbrk
.endif
@@ -35,7 +33,10 @@ CONFIGURE_ARGS?=--disable-fsck \
--disable-uuidd \
--enable-libblkid \
--enable-elf-shlibs \
+ --libdir='${PREFIX}/lib/e2fsprogs/' \
+ --includedir='${PREFIX}/include/e2fsprogs/' \
--with-root-prefix='${PREFIX}' \
+ --without-included-gettext \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
@@ -58,6 +59,8 @@ SMALLTESTS_DESC=Run tests that need <500 MB disk space
ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space)
+FUSEFS_CONFIGURE_ENABLE= fuse2fs
+
BUILD_DEPENDS+= gdd:sysutils/coreutils
LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid
@@ -75,8 +78,6 @@ MAKE_ARGS+= V=1
.if ${PORT_OPTIONS:MFUSEFS}
USES+= fuse
-CONFIGURE_ARGS+=--enable-fuse2fs
-LDFLAGS+= -L${LOCALBASE}/lib
.endif
.if ${PORT_OPTIONS:MNLS}
@@ -226,10 +227,16 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
-# ditch files installed by other ports already, or shadowing system files:
+# remove or relocate files installed by other ports already, or shadowing system files:
cd ${STAGEDIR}${PREFIX} && \
${XARGS} <${FILESDIR}/unwanted ${RM} && \
- ${RMDIR} include/blkid include/ss share/ss
+ ${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss
+ ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
+ ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1
+ ${MKDIR} ${STAGEDIR}${DATADIR}/et/
+ ${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/
+ ${REINPLACE_CMD} -e 's}^DIR=.*$$}DIR=${DATADIR}/et}' -i '' ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
+ ${RMDIR} ${STAGEDIR}${PREFIX}/share/et
#
# the next line closes .if ${MASTERDIR} == ${.CURDIR}
Modified: head/sysutils/e2fsprogs/files/unwanted
==============================================================================
--- head/sysutils/e2fsprogs/files/unwanted Mon Oct 30 16:19:26 2017 (r453194)
+++ head/sysutils/e2fsprogs/files/unwanted Mon Oct 30 16:55:26 2017 (r453195)
@@ -1,17 +1,17 @@
-lib/libblkid.so
-lib/libblkid.so.1
-lib/libblkid.so.1.0
-lib/libss.so
-lib/libss.so.2
-lib/libss.so.2.0
bin/mk_cmds
-include/blkid/blkid.h
-include/blkid/blkid_types.h
-include/ss/ss.h
-include/ss/ss_err.h
-lib/libblkid.a
-lib/libcom_err.a
-lib/libss.a
+include/e2fsprogs/blkid/blkid.h
+include/e2fsprogs/blkid/blkid_types.h
+include/e2fsprogs/ss/ss.h
+include/e2fsprogs/ss/ss_err.h
+lib/e2fsprogs/libblkid.a
+lib/e2fsprogs/libblkid.so
+lib/e2fsprogs/libblkid.so.1
+lib/e2fsprogs/libblkid.so.1.0
+lib/e2fsprogs/libcom_err.a
+lib/e2fsprogs/libss.a
+lib/e2fsprogs/libss.so
+lib/e2fsprogs/libss.so.2
+lib/e2fsprogs/libss.so.2.0
libdata/pkgconfig/blkid.pc
libdata/pkgconfig/ss.pc
man/man1/mk_cmds.1
Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist Mon Oct 30 16:19:26 2017 (r453194)
+++ head/sysutils/e2fsprogs/pkg-plist Mon Oct 30 16:55:26 2017 (r453195)
@@ -1,7 +1,36 @@
bin/chattr
+bin/e2fsprogs-compile_et
bin/lsattr
etc/mke2fs.conf.dist
+include/e2fsprogs/com_err.h
+include/e2fsprogs/e2p/e2p.h
+include/e2fsprogs/et/com_err.h
+include/e2fsprogs/ext2fs/bitops.h
+include/e2fsprogs/ext2fs/ext2_err.h
+include/e2fsprogs/ext2fs/ext2_ext_attr.h
+include/e2fsprogs/ext2fs/ext2_fs.h
+include/e2fsprogs/ext2fs/ext2_io.h
+include/e2fsprogs/ext2fs/ext2_types.h
+include/e2fsprogs/ext2fs/ext2fs.h
+include/e2fsprogs/ext2fs/ext3_extents.h
+include/e2fsprogs/ext2fs/qcow2.h
+include/e2fsprogs/ext2fs/tdb.h
+lib/e2fsprogs/libcom_err.so
+lib/e2fsprogs/libcom_err.so.2
+lib/e2fsprogs/libcom_err.so.2.1
+lib/e2fsprogs/libe2p.a
+lib/e2fsprogs/libe2p.so
+lib/e2fsprogs/libe2p.so.2
+lib/e2fsprogs/libe2p.so.2.3
+lib/e2fsprogs/libext2fs.a
+lib/e2fsprogs/libext2fs.so
+lib/e2fsprogs/libext2fs.so.2
+lib/e2fsprogs/libext2fs.so.2.4
+libdata/pkgconfig/com_err.pc
+libdata/pkgconfig/e2p.pc
+libdata/pkgconfig/ext2fs.pc
man/man1/chattr.1.gz
+man/man1/e2fsprogs-compile_et.1.gz
%%FUSEFS%%man/man1/fuse2fs.1.gz
man/man1/lsattr.1.gz
man/man5/e2fsck.conf.5.gz
@@ -54,6 +83,8 @@ sbin/mkfs.ext4
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
+%%DATADIR%%/et/et_c.awk
+%%DATADIR%%/et/et_h.awk
%%NLS%%share/locale/ca/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/da/LC_MESSAGES/e2fsprogs.mo
@@ -74,37 +105,3 @@ sbin/tune2fs
%%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
- at comment lib/libblkid.so
- at comment lib/libblkid.so.1
- at comment lib/libblkid.so.1.0
-lib/libcom_err.so
-lib/libcom_err.so.2
-lib/libcom_err.so.2.1
-lib/libe2p.so
-lib/libe2p.so.2
-lib/libe2p.so.2.3
-lib/libext2fs.so
-lib/libext2fs.so.2
-lib/libext2fs.so.2.4
-include/e2p/e2p.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/ext2fs/ext3_extents.h
-include/ext2fs/qcow2.h
-include/ext2fs/tdb.h
-lib/libe2p.a
-lib/libext2fs.a
-libdata/pkgconfig/e2p.pc
-libdata/pkgconfig/ext2fs.pc
-include/com_err.h
-include/et/com_err.h
-libdata/pkgconfig/com_err.pc
-bin/compile_et
-share/et/et_c.awk
-share/et/et_h.awk
-man/man1/compile_et.1.gz
Modified: head/sysutils/fusefs-ext2/Makefile
==============================================================================
--- head/sysutils/fusefs-ext2/Makefile Mon Oct 30 16:19:26 2017 (r453194)
+++ head/sysutils/fusefs-ext2/Makefile Mon Oct 30 16:55:26 2017 (r453195)
@@ -18,6 +18,8 @@ RUN_DEPENDS= mke2fs:sysutils/e2fsprogs
USES= autoreconf libtool fuse pkgconfig localbase:ldflags
USE_GITHUB= yes
GNU_CONFIGURE= yes
+CPPFLAGS+= -I${LOCALBASE}/include/e2fsprogs
+LDFLAGS+= -L${LOCALBASE}/lib/e2fsprogs -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs
GH_PROJECT= fuse-ext2
GH_ACCOUNT= alperakcan
More information about the svn-ports-all
mailing list