Sun Feb 27 15:41:56 2011 UTC ()
only redefine CONFLICTS if was defined in the first place.


(chs)
diff -r1.4 -r1.5 pkgsrc/emulators/suse113_linux/Makefile.common
cvs diff -r1.4 -r1.5 pkgsrc/emulators/suse113_linux/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/emulators/suse113_linux/Attic/Makefile.common 2011/02/27 15:00:06 1.4
+++ pkgsrc/emulators/suse113_linux/Attic/Makefile.common 2011/02/27 15:41:55 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.4 2011/02/27 15:00:06 chs Exp $ 1# $NetBSD: Makefile.common,v 1.5 2011/02/27 15:41:55 chs Exp $
2 2
3SUSE_PKG= yes 3SUSE_PKG= yes
4SUSE_VERSION= 11.3 4SUSE_VERSION= 11.3
5EMUL_REQD= suse>=${SUSE_VERSION} 5EMUL_REQD= suse>=${SUSE_VERSION}
6 6
7# The SuSE 11.x Linux packages are only usable on the following platforms. 7# The SuSE 11.x Linux packages are only usable on the following platforms.
8# The SUSE_COMPAT32 packages are available only on x86_64 and they emulate i386. 8# The SUSE_COMPAT32 packages are available only on x86_64 and they emulate i386.
9# The non-SUSE_COMPAT32 packages are available on both i386 and x86_64 9# The non-SUSE_COMPAT32 packages are available on both i386 and x86_64
10# and they emulate the corresponding linux platform. 10# and they emulate the corresponding linux platform.
11.if !defined(SUSE_COMPAT32) 11.if !defined(SUSE_COMPAT32)
12EMUL_PLATFORMS+= linux-x86_64 12EMUL_PLATFORMS+= linux-x86_64
13ONLY_FOR_PLATFORM+= NetBSD-5.99*-i386 13ONLY_FOR_PLATFORM+= NetBSD-5.99*-i386
14ONLY_FOR_PLATFORM+= NetBSD-[6-9]*-i386 14ONLY_FOR_PLATFORM+= NetBSD-[6-9]*-i386
@@ -49,27 +49,29 @@ MANCOMPRESSED?= yes @@ -49,27 +49,29 @@ MANCOMPRESSED?= yes
49EMUL_PKG_FMT?= rpm 49EMUL_PKG_FMT?= rpm
50RPM2PKG_PREFIX?= ${DESTDIR}${PREFIX} 50RPM2PKG_PREFIX?= ${DESTDIR}${PREFIX}
51RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} 51RPM2PKG_SUBPREFIX?= ${EMULSUBDIR}
52RPM2PKG_STAGE?= do-install 52RPM2PKG_STAGE?= do-install
53 53
54SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/} 54SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/}
55FILESDIR= ${SUSE_PKGSRCDIR}/files 55FILESDIR= ${SUSE_PKGSRCDIR}/files
56PATCHDIR= ${SUSE_PKGSRCDIR}/patches 56PATCHDIR= ${SUSE_PKGSRCDIR}/patches
57PKGDIR= ${SUSE_PKGSRCDIR} 57PKGDIR= ${SUSE_PKGSRCDIR}
58 58
59.if defined(SUSE_COMPAT32) 59.if defined(SUSE_COMPAT32)
60PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} 60PKGNAME:= ${DISTNAME:S/^suse_/suse32_/}
61COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} 61COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/}
 62.if defined(CONFLICTS)
62CONFLICTS:= ${CONFLICTS:S/^suse_/suse32_/} 63CONFLICTS:= ${CONFLICTS:S/^suse_/suse32_/}
 64.endif
63LINUX_BASE= linux32 65LINUX_BASE= linux32
64.else 66.else
65LINUX_BASE= linux 67LINUX_BASE= linux
66.endif 68.endif
67PLIST_SUBST+= LINUX_BASE=${LINUX_BASE:Q} 69PLIST_SUBST+= LINUX_BASE=${LINUX_BASE:Q}
68FILES_SUBST+= LINUX_BASE=${LINUX_BASE:Q} 70FILES_SUBST+= LINUX_BASE=${LINUX_BASE:Q}
69 71
70LINUX_LIBSUBDIR?= lib 72LINUX_LIBSUBDIR?= lib
71PLIST_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} 73PLIST_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
72FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} 74FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q}
73 75
74# Include an "override" SuSE-specific and architecture-specific 76# Include an "override" SuSE-specific and architecture-specific
75# Makefile fragment if it exists. 77# Makefile fragment if it exists.