From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 26 11:10:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3F2C16A422 for ; Thu, 26 Jan 2006 11:10:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DADB943D55 for ; Thu, 26 Jan 2006 11:10:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0QBA2r2096044 for ; Thu, 26 Jan 2006 11:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0QBA2Ai096038; Thu, 26 Jan 2006 11:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 26 Jan 2006 11:10:02 GMT Resent-Message-Id: <200601261110.k0QBA2Ai096038@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A3A716A420 for ; Thu, 26 Jan 2006 11:03:31 +0000 (GMT) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.de [213.165.64.21]) by mx1.FreeBSD.org (Postfix) with SMTP id 60D8443D45 for ; Thu, 26 Jan 2006 11:03:29 +0000 (GMT) (envelope-from matthias.andree@gmx.de) Received: (qmail invoked by alias); 26 Jan 2006 11:03:27 -0000 Received: from p5091237D.dip0.t-ipconnect.de (EHLO m2a2.dyndns.org) [80.145.35.125] by mail.gmx.net (mp025) with SMTP; 26 Jan 2006 12:03:27 +0100 Received: from localhost (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id 1FB5A2007E8; Thu, 26 Jan 2006 12:03:27 +0100 (CET) Received: from m2a2.dyndns.org ([127.0.0.1]) by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29381-17; Thu, 26 Jan 2006 12:03:24 +0100 (CET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.1.2]) by merlin.emma.line.org (Postfix) with ESMTP id 24554200651; Thu, 26 Jan 2006 12:03:24 +0100 (CET) Received: from emma by libertas.emma.line.org with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1F24uR-000Kzi-Gf; Thu, 26 Jan 2006 12:03:23 +0100 Message-Id: Date: Thu, 26 Jan 2006 12:03:23 +0100 From: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92356: [MAINTAINER] e2fsprogs fix conflicts w/ Kerberos, ossp-uuid X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthias Andree List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 11:10:07 -0000 >Number: 92356 >Category: ports >Synopsis: [MAINTAINER] e2fsprogs fix conflicts w/ Kerberos, ossp-uuid >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 26 11:10:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 6.0-STABLE FreeBSD 6.0-STABLE #10: Wed Jan 25 18:19:21 CET 2006 toor@libertas.emma.line.org:/usr/obj/usr/src/sys/MA5L i386 >Description: 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. >How-To-Repeat: >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 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 diff -Nur /usr/ports/audio/marlin/Makefile ././audio/marlin/Makefile --- /usr/ports/audio/marlin/Makefile Tue Nov 15 07:47:59 2005 +++ ././audio/marlin/Makefile Thu Jan 26 11:49:49 2006 @@ -6,6 +6,7 @@ PORTNAME= marlin PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ COMMENT= Sample editor for GNOME 2 using Gstreamer backend LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ - uuid.1:${PORTSDIR}/sysutils/e2fsprogs + uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid USE_X_PREFIX= yes USE_GMAKE= yes diff -Nur /usr/ports/devel/upnp/Makefile ././devel/upnp/Makefile --- /usr/ports/devel/upnp/Makefile Fri Dec 2 06:56:39 2005 +++ ././devel/upnp/Makefile Thu Jan 26 11:49:36 2006 @@ -7,7 +7,7 @@ PORTNAME= upnp PORTVERSION= 1.2.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -17,7 +17,7 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= Universal Plug and Play Software Development Kit -LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs +LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid CONFLICTS= upnp-1.[^2].* diff -Nur /usr/ports/devel/upnp104/Makefile ././devel/upnp104/Makefile --- /usr/ports/devel/upnp104/Makefile Fri Dec 2 06:52:51 2005 +++ ././devel/upnp104/Makefile Thu Jan 26 11:51:10 2006 @@ -7,7 +7,7 @@ PORTNAME= upnp PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -17,7 +17,7 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= Universal Plug and Play Software Development Kit -LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs +LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid CONFLICTS= upnp-1.[^0].* LATEST_LINK= upnp104 diff -Nur /usr/ports/misc/ossp-uuid/Makefile ././misc/ossp-uuid/Makefile --- /usr/ports/misc/ossp-uuid/Makefile Mon Jan 16 15:32:41 2006 +++ ././misc/ossp-uuid/Makefile Thu Jan 26 11:50:17 2006 @@ -7,6 +7,7 @@ PORTNAME= uuid PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= misc devel MASTER_SITES= ${MASTER_SITE_OSSP} MASTER_SITE_SUBDIR= lib/${PORTNAME} @@ -15,7 +16,7 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= ISO-C & Perl API and CLI for generating Universally Unique Identifiers -CONFLICTS= e2fsprogs-[0-9]* +CONFLICTS= e2fsprogs-libuuid-[0-9]* USE_REINPLACE= yes USE_GCC= 3.2+ --- /usr/ports/sysutils/e2fsprogs/Makefile Mon Jul 4 12:09:14 2005 +++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile Thu Jan 26 11:38:48 2006 @@ -7,26 +7,21 @@ PORTNAME= e2fsprogs PORTVERSION= 1.38 -PORTREVISION= 1 -CATEGORIES= sysutils +PORTREVISION?= 2 +CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= matthias.andree@gmx.de -COMMENT= Utilities and library to manipulate ext2/ext3 filesystems +MAINTAINER?= matthias.andree@gmx.de +COMMENT?= Utilities and library to manipulate ext2/ext3 filesystems .if !defined(WITHOUT_NLS) USE_GETTEXT= yes .endif PATCH_STRIP= -p1 -USE_REINPLACE= yes -USE_GMAKE= yes -INSTALL_TARGET= install install-libs -INSTALLS_SHLIB= yes -NO_FILTER_SHLIBS= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib" +CONFIGURE_ARGS?= --disable-fsck --disable-e2initrd-helper "--with-ldopts=-L${LOCALBASE}/lib" CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include' .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls @@ -36,15 +31,10 @@ PLIST_SUB= NLS="" .endif -CONFLICTS= ossp-uuid-[0-9]* +.if !defined(MASTERDIR) +SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -MAN1= chattr.1 lsattr.1 uuidgen.1 compile_et.1 mk_cmds.1 -MAN3= uuid.3 uuid_clear.3 com_err.3 uuid_compare.3 uuid_copy.3 \ - uuid_generate.3 uuid_is_null.3 uuid_parse.3 uuid_time.3 \ - uuid_unparse.3 uuid_generate_random.3 uuid_generate_time.3 \ - libblkid.3 +MAN1= chattr.1 lsattr.1 MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \ mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \ fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \ @@ -62,30 +52,35 @@ post-extract: ${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ ${WRKSRC}/${CONFIGURE_SCRIPT} +.endif .include post-patch: ${REINPLACE_CMD} -E -e 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ ${WRKSRC}/lib/*/Makefile.in + @: # disable uuidgen + ${REINPLACE_CMD} \ + -e 's/^\(UPROGS.*\) uuidgen\(.*\)/\1\2/' \ + -e 's/^\(UMANPAGES.*\) uuidgen.1\(.*\)/\1\2/' \ + ${WRKSRC}/misc/Makefile.in -pre-install: - ${RM} -f ${PKGMESSAGE} - ${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - +.if ${MASTERDIR} == ${.CURDIR} post-build: .if !defined(WITHOUT_NLS) cd ${WRKSRC}/po && ${GMAKE} update-gmo .endif - ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s -static ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c cd ${WRKSRC}/tests && ${GMAKE} check post-install: ${RM} ${PREFIX}/sbin/filefrag ${RM} ${PREFIX}/man/man8/filefrag.8 + ${RM} ${PREFIX}/info/libext2fs.info.gz ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/ @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} +.endif .include >Release-Note: >Audit-Trail: >Unformatted: