Index: head/devel/e2fsprogs-libss/Makefile =================================================================== --- head/devel/e2fsprogs-libss/Makefile (revision 354892) +++ head/devel/e2fsprogs-libss/Makefile (revision 354893) @@ -1,34 +1,33 @@ # Created by: Ben Kaduk # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -libss MAINTAINER= kaduk-fbsd@mit.edu COMMENT= Command-line interface parsing library from e2fsprogs CONFLICTS= heimdal-[0-9]* CONFLICTS+= krb4-[0-9]* OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS CONFIGURE_ARGS= --enable-elf-shlibs MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs GNU_CONFIGURE= yes -USES= gmake USE_LDCONFIG= yes ALL_TARGET= subs INSTALL_WRKSRC= ${WRKSRC}/lib/ss FILESDIR= ${.CURDIR}/files PKGDIR= ${.CURDIR} pre-build: @(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \ ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h) post-build: @(cd ${WRKSRC}/lib/ss && ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} all) .include "${MASTERDIR}/Makefile" Index: head/devel/e2fsprogs-libss/pkg-plist =================================================================== --- head/devel/e2fsprogs-libss/pkg-plist (revision 354892) +++ head/devel/e2fsprogs-libss/pkg-plist (revision 354893) @@ -1,14 +1,13 @@ bin/mk_cmds include/ss/ss.h include/ss/ss_err.h lib/libss.so.2.0 lib/libss.so lib/libss.a lib/libss.so.2 -lib/pkgconfig/ss.pc +libdata/pkgconfig/ss.pc man/man1/mk_cmds.1.gz share/ss/ct_c.awk share/ss/ct_c.sed -@dirrmtry lib/pkgconfig @dirrm include/ss @dirrm share/ss Index: head/misc/e2fsprogs-libblkid/Makefile =================================================================== --- head/misc/e2fsprogs-libblkid/Makefile (revision 354892) +++ head/misc/e2fsprogs-libblkid/Makefile (revision 354893) @@ -1,32 +1,31 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid COMMENT= A blkid library from e2fsprogs package LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid CONFIGURE_ARGS= --enable-elf-shlibs MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/blkid -USES= gmake USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/blkid PKGDIR= ${.CURDIR} pre-build: ${MKDIR} ${WRKSRC}/lib/blkid/elfshared cd ${WRKSRC}/util && ${GMAKE} subst post-build: cd ${WRKSRC}/lib/uuid && ${GMAKE} cd ${INSTALL_WRKSRC} && ${GMAKE} check .include "${MASTERDIR}/Makefile" Index: head/misc/e2fsprogs-libblkid/pkg-plist =================================================================== --- head/misc/e2fsprogs-libblkid/pkg-plist (revision 354892) +++ head/misc/e2fsprogs-libblkid/pkg-plist (revision 354893) @@ -1,10 +1,9 @@ include/blkid/blkid.h include/blkid/blkid_types.h lib/libblkid.so.1.0 lib/libblkid.so.1 lib/libblkid.so lib/libblkid.a -lib/pkgconfig/blkid.pc -@dirrmtry lib/pkgconfig +libdata/pkgconfig/blkid.pc @dirrm include/blkid man/man3/libblkid.3.gz Index: head/misc/e2fsprogs-libuuid/Makefile =================================================================== --- head/misc/e2fsprogs-libuuid/Makefile (revision 354892) +++ head/misc/e2fsprogs-libuuid/Makefile (revision 354893) @@ -1,50 +1,49 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libuuid COMMENT= UUID library from e2fsprogs package CONFLICTS= ossp-uuid-[0-9]* CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS OPTIONSFILE= # works around optionsNG trouble MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid -USES= gmake USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/uuid FILESDIR= ${.CURDIR}/files USE_RC_SUBR= uuidd PKGDIR= ${.CURDIR} post-patch:: ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \ -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \ ${WRKSRC}/lib/uuid/*.[ch] pre-build: ${MKDIR} ${WRKSRC}/lib/uuid/elfshared cd ${WRKSRC}/util && ${GMAKE} subst # ulimit guards against runaway tests # failure to launch uuidd is fine (one might be running, or we may lack # privileges); if it works, it'll quit after 50 seconds post-build: cd ${WRKSRC}/misc && ${GMAKE} uuidgen uuidgen.1 uuidd uuidd.8 cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${GMAKE} check ) post-install: ${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" Index: head/misc/e2fsprogs-libuuid/pkg-plist =================================================================== --- head/misc/e2fsprogs-libuuid/pkg-plist (revision 354892) +++ head/misc/e2fsprogs-libuuid/pkg-plist (revision 354893) @@ -1,26 +1,25 @@ bin/uuidgen include/uuid/uuid.h lib/libuuid.so.1.2 lib/libuuid.so.1 lib/libuuid.so lib/libuuid.a -lib/pkgconfig/uuid.pc +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 @exec mkdir -p /var/run/libuuid -@dirrmtry lib/pkgconfig @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 Index: head/sysutils/e2fsprogs/Makefile =================================================================== --- head/sysutils/e2fsprogs/Makefile (revision 354892) +++ head/sysutils/e2fsprogs/Makefile (revision 354893) @@ -1,136 +1,141 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= e2fsprogs PORTVERSION= 1.42.10 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} MAINTAINER?= mandree@FreeBSD.org COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems LICENSE= GPLv2 PATCH_STRIP= -p1 USES= gmake pkgconfig tar:xz USE_CSTD= gnu99 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ --enable-quota \ --with-root-prefix='${PREFIX}' CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS -MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' +MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true .if !defined(MASTERDIR) OPTIONS_DEFINE= DOCS NLS OPTIONS_DEFAULT= NLS OPTIONS_EXCLUDE+= EXAMPLES PORTDOCS= COPYING RELEASE-NOTES post-extract: @${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ ${WRKSRC}/${CONFIGURE_SCRIPT} .endif PKGDEINSTALL= ${PKGINSTALL} # get more details into tinderbox logs .if defined(PACKAGE_BUILDING) MAKE_ARGS+= V=1 .endif .include .if ${PORT_OPTIONS:MNLS} USES+= gettext iconv:build .endif .include .if ${PORT_OPTIONS:MNLS} PLIST_SUB= NLS="" . if empty(ICONV_LIB) libintl= "${LOCALBASE}/lib/libintl.a" . else libintl= "${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" . endif .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB= NLS="@comment " libintl= .endif post-patch:: @${REINPLACE_CMD} -E -e \ 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ ${WRKSRC}/lib/*/Makefile.in # don't build/install libext2fs.info @${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s %s\\n" $$(md5 -q \1) \1/' \ -e "s/ == 0/ = 0/" ${WRKSRC}/tests/[a-t]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c # disable f_mmp_garbage, fails on FreeBSD, and the resize*big_expand tests, # which are too unwieldy to run automatically (need too much free space). # f_extent_oobounds fails in Tinderbox and is fine outside, reason unclear. .for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} .endfor .if ${MASTERDIR} == ${.CURDIR} +pre-build: +# fix up Makefile ordering for parallel builds + cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et + cd ${WRKSRC}/e2fsck && ${DO_MAKE_BUILD} prof_err.h + post-build: # Relink e2fsck statically - We need to make sure that tools for the root file # system are statically linked against anything that is outside the root fs, # else we're in trouble if e2fsck is needed for boot: # (we don't use e2fsck.static, since we can link libc.so dynamically) cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \ && ${GMAKE} e2fsck \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ ../lib/libblkid.a ../lib/libuuid.a" \ LIBINTL=${libintl} # Regression check: avoid a port (not upstream!) regression from 1.40.5, # check that e2fsck isn't dynalinked against anything but libc.so: @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects beyond libc and libgcc: " @a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \ | ${GREP} -v 'not a dynamic executable' \ | ${GREP} '=>' \ | ${AWK} '{print $$3;}' \ | ${EGREP} -v '^/lib/libgcc(_s)?\.so\.' \ | ${GREP} -v '^/lib/libc\.so\.' || :)"; \ if test "x$$a" = "x" ; then echo 'PASS' ; else \ echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi # Update translation binary files .if ${PORT_OPTIONS:MNLS} cd ${WRKSRC}/po && ${GMAKE} update-gmo .endif # Build fsck(8) wrapper ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \ -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c # While the ${MAKE} check can take a minute on an end user's system, the # correctness of tools such as e2fsck is critical to the health of the # file systems. The upstream is not using any *BSD as his development # system, and therefore let's exercise due diligence in running the self- # test on each and every system and not just package building hosts. # There have been subtle failures induced by Linux-isms in the past. # -- Matthias Andree, package maintainer, 2007-09-18 @${ECHO_CMD} '===> Running e2fsprogs self-test suite' cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${GMAKE} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \ || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } post-install: ${RM} -f ${STAGEDIR}${PREFIX}/sbin/uuidd ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif # the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif .include