From owner-svn-ports-all@FreeBSD.ORG Thu May 22 21:56:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49209765; Thu, 22 May 2014 21:56:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29D092FB4; Thu, 22 May 2014 21:56:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MLustR014579; Thu, 22 May 2014 21:56:54 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MLuqHp014569; Thu, 22 May 2014 21:56:52 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201405222156.s4MLuqHp014569@svn.freebsd.org> From: Matthias Andree Date: Thu, 22 May 2014 21:56:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354893 - in head: devel/e2fsprogs-libss misc/e2fsprogs-libblkid misc/e2fsprogs-libuuid sysutils/e2fsprogs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2014 21:56:54 -0000 Author: mandree Date: Thu May 22 21:56:52 2014 New Revision: 354893 URL: http://svnweb.freebsd.org/changeset/ports/354893 QAT: https://qat.redports.org/buildarchive/r354893/ Log: Fix location of .pc files for pkg-config [1]. Fix issue with parallel build, pre-build prof_err.h. Reported by: ak@, mat@ [1] Modified: head/devel/e2fsprogs-libss/Makefile head/devel/e2fsprogs-libss/pkg-plist head/misc/e2fsprogs-libblkid/Makefile head/misc/e2fsprogs-libblkid/pkg-plist head/misc/e2fsprogs-libuuid/Makefile head/misc/e2fsprogs-libuuid/pkg-plist head/sysutils/e2fsprogs/Makefile Modified: head/devel/e2fsprogs-libss/Makefile ============================================================================== --- head/devel/e2fsprogs-libss/Makefile Thu May 22 21:44:51 2014 (r354892) +++ head/devel/e2fsprogs-libss/Makefile Thu May 22 21:56:52 2014 (r354893) @@ -1,7 +1,7 @@ # Created by: Ben Kaduk # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -libss @@ -15,7 +15,6 @@ 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 Modified: head/devel/e2fsprogs-libss/pkg-plist ============================================================================== --- head/devel/e2fsprogs-libss/pkg-plist Thu May 22 21:44:51 2014 (r354892) +++ head/devel/e2fsprogs-libss/pkg-plist Thu May 22 21:56:52 2014 (r354893) @@ -5,10 +5,9 @@ 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 Modified: head/misc/e2fsprogs-libblkid/Makefile ============================================================================== --- head/misc/e2fsprogs-libblkid/Makefile Thu May 22 21:44:51 2014 (r354892) +++ head/misc/e2fsprogs-libblkid/Makefile Thu May 22 21:56:52 2014 (r354893) @@ -1,7 +1,7 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid @@ -13,7 +13,6 @@ 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 Modified: head/misc/e2fsprogs-libblkid/pkg-plist ============================================================================== --- head/misc/e2fsprogs-libblkid/pkg-plist Thu May 22 21:44:51 2014 (r354892) +++ head/misc/e2fsprogs-libblkid/pkg-plist Thu May 22 21:56:52 2014 (r354893) @@ -4,7 +4,6 @@ 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 Modified: head/misc/e2fsprogs-libuuid/Makefile ============================================================================== --- head/misc/e2fsprogs-libuuid/Makefile Thu May 22 21:44:51 2014 (r354892) +++ head/misc/e2fsprogs-libuuid/Makefile Thu May 22 21:56:52 2014 (r354893) @@ -1,7 +1,7 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libuuid @@ -15,7 +15,6 @@ 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 Modified: head/misc/e2fsprogs-libuuid/pkg-plist ============================================================================== --- head/misc/e2fsprogs-libuuid/pkg-plist Thu May 22 21:44:51 2014 (r354892) +++ head/misc/e2fsprogs-libuuid/pkg-plist Thu May 22 21:56:52 2014 (r354893) @@ -4,7 +4,7 @@ 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 @@ -20,7 +20,6 @@ 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 Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Thu May 22 21:44:51 2014 (r354892) +++ head/sysutils/e2fsprogs/Makefile Thu May 22 21:56:52 2014 (r354893) @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--disable-fsck --disable --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) @@ -81,6 +81,11 @@ post-patch:: .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,