Date: Mon, 20 Dec 2004 00:12:47 GMT From: Mark Linimon <linimon@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obrien@FreeBSD.org Subject: ports/75283: [patch] cleanup after removal of chinese/cle_base Message-ID: <200412200012.iBK0ClYE044270@freefall.freebsd.org> Resent-Message-ID: <200412200020.iBK0KAXo044354@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75283
>Category: ports
>Synopsis: [patch] cleanup after removal of chinese/cle_base
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 20 00:20:10 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Mark Linimon
>Release: FreeBSD 4.10-STABLE i386
>Organization:
FreeBSD
>Environment:
System: FreeBSD freefall.freebsd.org 4.10-STABLE FreeBSD 4.10-STABLE #14: Sun Nov 21 01:22:46 GMT 2004 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386
>Description:
Recently I removed chinese/cle_base as part of our process of
reaping ports with unfixed security problems. obrien has pointed
out that I failed to remove all the remnants -- in this case,
various CONFLICTS lines. (He has already removed the one in
emulators/linux_base-gentoo-stage1).
I would go ahead and commit this myself immediately except for
the fact that I know there are other patches circulating that
affect these ports, including proposed repocopies. Thus, I am
Cc:ing everyone that I am aware of that is working in that area.
I'll assign it to myself, but wait to be advised about whether
it would create any conflicts before proceeding.
>How-To-Repeat:
(n/a)
>Fix:
Index: linux_base/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/emulators/linux_base/Makefile,v
retrieving revision 1.88
diff -u -r1.88 Makefile
--- linux_base/Makefile 14 Dec 2004 19:26:50 -0000 1.88
+++ linux_base/Makefile 19 Dec 2004 23:40:51 -0000
@@ -48,7 +48,7 @@
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS=cle_base-* linux_base-6* linux_base-8* linux_base-deb* linux_base-gen*
+CONFLICTS=linux_base-6* linux_base-8* linux_base-deb* linux_base-gen*
ONLY_FOR_ARCHS= alpha i386
DIST_SUBDIR= rpm
PREFIX= ${LINUXBASE}
Index: linux_base-6/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/emulators/linux_base-6/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- linux_base-6/Makefile 6 Feb 2004 11:20:42 -0000 1.77
+++ linux_base-6/Makefile 19 Dec 2004 23:40:30 -0000
@@ -29,7 +29,7 @@
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS=cle_base-* linux_base-7* linux_base-8* linux_base-deb* linux_base-gen*
+CONFLICTS=linux_base-7* linux_base-8* linux_base-deb* linux_base-gen*
ONLY_FOR_ARCHS= alpha i386
DIST_SUBDIR= rpm
PREFIX= ${LINUXBASE}
Index: linux_base-8/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/emulators/linux_base-8/Makefile,v
retrieving revision 1.91
diff -u -r1.91 Makefile
--- linux_base-8/Makefile 19 Dec 2004 02:13:56 -0000 1.91
+++ linux_base-8/Makefile 19 Dec 2004 23:44:48 -0000
@@ -54,7 +54,7 @@
EXTRACT_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
+CONFLICTS=linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
RESTRICTED= "binaries under GNU GPL without accompanying source"
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm/${MACHINE_ARCH}/${PORTVERSION}
Index: linux_base-debian/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/emulators/linux_base-debian/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- linux_base-debian/Makefile 18 Dec 2004 23:02:24 -0000 1.11
+++ linux_base-debian/Makefile 19 Dec 2004 23:46:27 -0000
@@ -20,7 +20,7 @@
BUILD_DEPENDS= ${DPKG_CMD}:${PORTSDIR}/archivers/dpkg
-CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-8* linux_base-gento*
+CONFLICTS=linux_base-6* linux_base-7* linux_base-8* linux_base-gento*
DIST_SUBDIR= debian-${PORTVERSION}-${DISTDATE}
DISTDATE= 2002-07-18
WRKSRC= ${WRKDIR}/var/cache/apt/archives
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412200012.iBK0ClYE044270>