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 context 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,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2011/02/27 15:00:06 chs Exp $
+# $NetBSD: Makefile.common,v 1.5 2011/02/27 15:41:55 chs Exp $
 
 SUSE_PKG=		yes
 SUSE_VERSION=		11.3
@@ -59,7 +59,9 @@
 .if defined(SUSE_COMPAT32)
 PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
 COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
+.if defined(CONFLICTS)
 CONFLICTS:=		${CONFLICTS:S/^suse_/suse32_/}
+.endif
 LINUX_BASE=		linux32
 .else
 LINUX_BASE=		linux