diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2004-02-05 23:19:55 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2004-02-05 23:19:55 +0000 |
commit | 4100e887255ffd312146d9b88843045d0d9a0fa2 (patch) | |
tree | 2a4f912e27bf17d1afa758838938626c1294789e /emulators/linux_base-debian | |
parent | Fix compilation of PAM support on -STABLE. (diff) |
Fix CONFLICTS lines, as requested by eik then petef:
I think it's a bug that linux_base thinks it conflicts with itself.
--petef
The problem occurs if you do
make install; make install FORCE_PKG_REGISTER=yes
which is somewhat supported, although [seldom] (never?) used.
--eik
Also record conflicts with cle_base.
Diffstat (limited to 'emulators/linux_base-debian')
-rw-r--r-- | emulators/linux_base-debian/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulators/linux_base-debian/Makefile b/emulators/linux_base-debian/Makefile index e3d85ff96f0f..20d55c718190 100644 --- a/emulators/linux_base-debian/Makefile +++ b/emulators/linux_base-debian/Makefile @@ -20,7 +20,7 @@ COMMENT= Debian base set for the Linux mode BUILD_DEPENDS= ${DPKG_CMD}:${PORTSDIR}/archivers/dpkg -CONFLICTS= linux_base-* +CONFLICTS=cle_base-* 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 |