Put back PKGNAME definitions.

95 files changed, 189 insertions, 189 deletions

diff --git a/emulators/suse100_alsa/Makefile b/emulators/suse100_alsa/Makefile
index 1b45bbcd2cb..6f79571d5a4 100644
--- a/emulators/suse100_alsa/Makefile
+++ b/emulators/suse100_alsa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:12 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_alsa-${SUSE_VERSION}
+PKGNAME=	suse_alsa-${SUSE_VERSION}
 CATEGORIES=	emulators
 DISTFILES=	alsa-1.0.9-23.2.${SUSE_ARCH}.rpm
 
diff --git a/emulators/suse100_aspell/Makefile b/emulators/suse100_aspell/Makefile
index c5543a50f50..86f9ec88d9e 100644
--- a/emulators/suse100_aspell/Makefile
+++ b/emulators/suse100_aspell/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:12 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_aspell-${SUSE_VERSION}
+PKGNAME=	suse_aspell-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 DISTFILES=	aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
index af0daa6b716..ea9ea8e8bba 100644
--- a/emulators/suse100_base/Makefile
+++ b/emulators/suse100_base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/02/11 09:38:12 obache Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_base-${SUSE_VERSION}
+PKGNAME=	suse_base-${SUSE_VERSION}
 PKGREVISION=	7
 CATEGORIES=	emulators
 
diff --git a/emulators/suse100_compat/Makefile b/emulators/suse100_compat/Makefile
index d191893df39..558ca08ce02 100644
--- a/emulators/suse100_compat/Makefile
+++ b/emulators/suse100_compat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_compat-${SUSE_VERSION}
+PKGNAME=	suse_compat-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 DISTFILES+=	compat-2004.11.13-4.${SUSE_ARCH}.rpm			\
diff --git a/emulators/suse100_expat/Makefile b/emulators/suse100_expat/Makefile
index 82a4476994f..bdbfe74dbf2 100644
--- a/emulators/suse100_expat/Makefile
+++ b/emulators/suse100_expat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_expat-${SUSE_VERSION}
+PKGNAME=	suse_expat-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 DISTFILES=	expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile
index ec258db1c30..173c9678ebb 100644
--- a/emulators/suse100_fontconfig/Makefile
+++ b/emulators/suse100_fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.14 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGNAME=	suse_fontconfig-${SUSE_VERSION}
 PKGREVISION=	7
 CATEGORIES=	emulators
 DISTFILES=	fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/Makefile b/emulators/suse100_freetype2/Makefile
index c531b2e217b..881d978796e 100644
--- a/emulators/suse100_freetype2/Makefile
+++ b/emulators/suse100_freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.11 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_freetype2-${SUSE_VERSION}
+PKGNAME=	suse_freetype2-${SUSE_VERSION}
 PKGREVISION=	5
 CATEGORIES=	emulators
 DISTFILES=	freetype2-2.1.10-4.9.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile b/emulators/suse100_glx/Makefile
index 13d602515d1..2a6193d8143 100644
--- a/emulators/suse100_glx/Makefile
+++ b/emulators/suse100_glx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGNAME=	suse_glx-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index 5314942027a..a54b77084e1 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.12 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGNAME=	suse_gtk2-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 DISTFILES=	atk-1.10.3-2.${SUSE_ARCH}.rpm				\
diff --git a/emulators/suse100_krb5/Makefile b/emulators/suse100_krb5/Makefile
index d5b38086979..8003bfbf4c2 100644
--- a/emulators/suse100_krb5/Makefile
+++ b/emulators/suse100_krb5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=		suse_krb5-${SUSE_VERSION}
+PKGNAME=		suse_krb5-${SUSE_VERSION}
 CATEGORIES=		emulators
 DISTFILES=		krb5-1.4.1-5.11.${SUSE_ARCH}.rpm		\
 			libcom_err-1.38-4.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/Makefile b/emulators/suse100_libcups/Makefile
index bc398cc6d59..e8c3a73b128 100644
--- a/emulators/suse100_libcups/Makefile
+++ b/emulators/suse100_libcups/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_libcups-${SUSE_VERSION}
+PKGNAME=	suse_libcups-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 DISTFILES=	cups-libs-1.1.23-21.16.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libidn/Makefile b/emulators/suse100_libidn/Makefile
index 6556b0d9974..85e15d70128 100644
--- a/emulators/suse100_libidn/Makefile
+++ b/emulators/suse100_libidn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_libidn-${SUSE_VERSION}
+PKGNAME=	suse_libidn-${SUSE_VERSION}
 CATEGORIES=	emulators
 DISTFILES+=	libidn-0.5.9-5.${SUSE_ARCH}.rpm
 
diff --git a/emulators/suse100_libjpeg/Makefile b/emulators/suse100_libjpeg/Makefile
index ef7c323ed92..b17548870eb 100644
--- a/emulators/suse100_libjpeg/Makefile
+++ b/emulators/suse100_libjpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:43 jperkin Exp $
 
-DISTNAME=	suse_libjpeg-${SUSE_VERSION}
+PKGNAME=	suse_libjpeg-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 DISTFILES=	libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/Makefile b/emulators/suse100_libpng/Makefile
index d0e1e41241d..4a3f382c62f 100644
--- a/emulators/suse100_libpng/Makefile
+++ b/emulators/suse100_libpng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_libpng-${SUSE_VERSION}
+PKGNAME=	suse_libpng-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 DISTFILES=	libpng-1.2.8-5.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libsigc++2/Makefile b/emulators/suse100_libsigc++2/Makefile
index 7d9e8240b38..3a5b0cb46b5 100644
--- a/emulators/suse100_libsigc++2/Makefile
+++ b/emulators/suse100_libsigc++2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_libsigc++2-${SUSE_VERSION}
+PKGNAME=	suse_libsigc++2-${SUSE_VERSION}
 CATEGORIES=	emulators
 DISTFILES=	libsigc++2-2.0.16-3.${SUSE_ARCH}.rpm
 
diff --git a/emulators/suse100_libtiff/Makefile b/emulators/suse100_libtiff/Makefile
index 930e6f5ac85..4375b0101f3 100644
--- a/emulators/suse100_libtiff/Makefile
+++ b/emulators/suse100_libtiff/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_libtiff-${SUSE_VERSION}
+PKGNAME=	suse_libtiff-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 DISTFILES=	libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/Makefile b/emulators/suse100_libxml2/Makefile
index 46db6da1b5c..e4404ca8d24 100644
--- a/emulators/suse100_libxml2/Makefile
+++ b/emulators/suse100_libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:13 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_libxml2-${SUSE_VERSION}
+PKGNAME=	suse_libxml2-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 DISTFILES=	libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
index b589ff9a1ce..93931fc8e3d 100644
--- a/emulators/suse100_linux/Makefile.common
+++ b/emulators/suse100_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile.common,v 1.28 2015/02/16 10:15:44 jperkin Exp $
 #
 # used by emulators/suse100_alsa/Makefile
 # used by emulators/suse100_alsa/Makefile
@@ -105,7 +105,7 @@ PATCHDIR=		${SUSE_PKGSRCDIR}/patches
 PKGDIR=			${SUSE_PKGSRCDIR}
 
 .if defined(SUSE_COMPAT32)
-PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
+PKGNAME:=		${PKGNAME:S/^suse_/suse32_/}
 COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
 LINUX_BASE=		linux32
 .else
diff --git a/emulators/suse100_locale/Makefile b/emulators/suse100_locale/Makefile
index 9d506b49a83..60890a48aa8 100644
--- a/emulators/suse100_locale/Makefile
+++ b/emulators/suse100_locale/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_locale-${SUSE_VERSION}
+PKGNAME=	suse_locale-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 DISTFILES=	glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/Makefile b/emulators/suse100_openmotif/Makefile
index 20e1ef912e5..13adddb7cf3 100644
--- a/emulators/suse100_openmotif/Makefile
+++ b/emulators/suse100_openmotif/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_openmotif-${SUSE_VERSION}
+PKGNAME=	suse_openmotif-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 
diff --git a/emulators/suse100_openssl/Makefile b/emulators/suse100_openssl/Makefile
index 493650d52eb..a8147de94ec 100644
--- a/emulators/suse100_openssl/Makefile
+++ b/emulators/suse100_openssl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_openssl-${SUSE_VERSION}
+PKGNAME=	suse_openssl-${SUSE_VERSION}
 PKGREVISION=	5
 CATEGORIES=	emulators
 DISTFILES=	openssl-0.9.7g-2.15.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_resmgr/Makefile b/emulators/suse100_resmgr/Makefile
index 8f35c6117ca..9e794df10df 100644
--- a/emulators/suse100_resmgr/Makefile
+++ b/emulators/suse100_resmgr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_resmgr-${SUSE_VERSION}
+PKGNAME=	suse_resmgr-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 DISTFILES=	resmgr-0.9.8_SVNr57-2.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile
index bf1da07b41e..166536f0299 100644
--- a/emulators/suse100_slang/Makefile
+++ b/emulators/suse100_slang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_slang-${SUSE_VERSION}
+PKGNAME=	suse_slang-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 DISTFILES=	slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/Makefile b/emulators/suse100_x11/Makefile
index bbcb2c1f4cb..72c1ac9a364 100644
--- a/emulators/suse100_x11/Makefile
+++ b/emulators/suse100_x11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_x11-${SUSE_VERSION}
+PKGNAME=	suse_x11-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 DISTFILES=	xorg-x11-libs-6.8.2-100.13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse121_alsa/Makefile b/emulators/suse121_alsa/Makefile
index df845a964dd..ef60a326edb 100644
--- a/emulators/suse121_alsa/Makefile
+++ b/emulators/suse121_alsa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_alsa-${SUSE_VERSION}
+PKGNAME=	suse_alsa-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	alsa-1.0.24.1-23.1.2.${SUSE_ARCH}
 RPMPKGS+=	alsa-oss-1.0.17-37.1.2.${SUSE_ARCH}
diff --git a/emulators/suse121_aspell/Makefile b/emulators/suse121_aspell/Makefile
index ac8afe9b240..1398b9a6bd1 100644
--- a/emulators/suse121_aspell/Makefile
+++ b/emulators/suse121_aspell/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:44 jperkin Exp $
 
-DISTNAME=	suse_aspell-${SUSE_VERSION}
+PKGNAME=	suse_aspell-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	aspell-0.60.6.1-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_base/Makefile b/emulators/suse121_base/Makefile
index c70cecd613b..a63d72b4e38 100644
--- a/emulators/suse121_base/Makefile
+++ b/emulators/suse121_base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_base-${SUSE_VERSION}
+PKGNAME=	suse_base-${SUSE_VERSION}
 PKGREVISION=	6
 CATEGORIES=	emulators
 RPMUPDPKGS+=	aaa_base-${SUSE_VERSION}-534.113.1.${SUSE_ARCH}
diff --git a/emulators/suse121_compat/Makefile b/emulators/suse121_compat/Makefile
index 50ea1d3fe19..dca681402c6 100644
--- a/emulators/suse121_compat/Makefile
+++ b/emulators/suse121_compat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_compat-${SUSE_VERSION}
+PKGNAME=	suse_compat-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMPKGS+=	libstdc++33-3.3.3-30.25.2.${SUSE_ARCH}
diff --git a/emulators/suse121_expat/Makefile b/emulators/suse121_expat/Makefile
index 7112d13def3..72487bfa146 100644
--- a/emulators/suse121_expat/Makefile
+++ b/emulators/suse121_expat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_expat-${SUSE_VERSION}
+PKGNAME=	suse_expat-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libexpat1-2.0.1-109.7.1.${SUSE_ARCH}
diff --git a/emulators/suse121_fontconfig/Makefile b/emulators/suse121_fontconfig/Makefile
index cce2aa638c4..6e43f55936d 100644
--- a/emulators/suse121_fontconfig/Makefile
+++ b/emulators/suse121_fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:14 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGNAME=	suse_fontconfig-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	fontconfig-2.8.0-24.14.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_freetype2/Makefile b/emulators/suse121_freetype2/Makefile
index 56b5da9e67c..6ff85af4940 100644
--- a/emulators/suse121_freetype2/Makefile
+++ b/emulators/suse121_freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_freetype2-${SUSE_VERSION}
+PKGNAME=	suse_freetype2-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libfreetype6-2.4.7-9.1.${SUSE_ARCH}
diff --git a/emulators/suse121_glx/Makefile b/emulators/suse121_glx/Makefile
index 35f9887dd27..baeba1b2e94 100644
--- a/emulators/suse121_glx/Makefile
+++ b/emulators/suse121_glx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGNAME=	suse_glx-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMPKGS+=	Mesa-7.11-11.1.2.${SUSE_ARCH}
diff --git a/emulators/suse121_gstreamer/Makefile b/emulators/suse121_gstreamer/Makefile
index 48fe237d1b6..03371382b1b 100644
--- a/emulators/suse121_gstreamer/Makefile
+++ b/emulators/suse121_gstreamer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_gstreamer-${SUSE_VERSION}
+PKGNAME=	suse_gstreamer-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libgstapp-0_10-0-0.10.35-6.1.2.${SUSE_ARCH}
 RPMPKGS+=	libgstbasevideo-0_10-0-0.10.22-8.1.2.${SUSE_ARCH}
diff --git a/emulators/suse121_gtk2/Makefile b/emulators/suse121_gtk2/Makefile
index c1b45c8adfa..4046a79cf33 100644
--- a/emulators/suse121_gtk2/Makefile
+++ b/emulators/suse121_gtk2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGNAME=	suse_gtk2-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 RPMPKGS+=	libcairo2-1.10.2-14.1.3.${SUSE_ARCH}
diff --git a/emulators/suse121_krb5/Makefile b/emulators/suse121_krb5/Makefile
index 7a49083660e..6298eabc922 100644
--- a/emulators/suse121_krb5/Makefile
+++ b/emulators/suse121_krb5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_krb5-${SUSE_VERSION}
+PKGNAME=	suse_krb5-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	krb5-1.9.1-24.20.1.${SUSE_ARCH}
diff --git a/emulators/suse121_libcups/Makefile b/emulators/suse121_libcups/Makefile
index 8dfd07b30f8..559e2d26928 100644
--- a/emulators/suse121_libcups/Makefile
+++ b/emulators/suse121_libcups/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_libcups-${SUSE_VERSION}
+PKGNAME=	suse_libcups-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	cups-libs-1.5.0-2.1.3.${SUSE_ARCH}
 
diff --git a/emulators/suse121_libcurl/Makefile b/emulators/suse121_libcurl/Makefile
index 17e28db8362..2368f0bc968 100644
--- a/emulators/suse121_libcurl/Makefile
+++ b/emulators/suse121_libcurl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_libcurl-${SUSE_VERSION}
+PKGNAME=	suse_libcurl-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libcurl4-7.22.0-2.14.1.${SUSE_ARCH}
diff --git a/emulators/suse121_libdrm/Makefile b/emulators/suse121_libdrm/Makefile
index 96bebbd6285..00be91ed258 100644
--- a/emulators/suse121_libdrm/Makefile
+++ b/emulators/suse121_libdrm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_libdrm-${SUSE_VERSION}
+PKGNAME=	suse_libdrm-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libdrm-2.4.26-15.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_libjpeg/Makefile b/emulators/suse121_libjpeg/Makefile
index 3915769c9e5..4bb22bdeab0 100644
--- a/emulators/suse121_libjpeg/Makefile
+++ b/emulators/suse121_libjpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_libjpeg-${SUSE_VERSION}
+PKGNAME=	suse_libjpeg-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libjpeg62-62.0.0-10.4.1.${SUSE_ARCH}
diff --git a/emulators/suse121_libpng/Makefile b/emulators/suse121_libpng/Makefile
index 33e51d48ae0..b81e1a0fe30 100644
--- a/emulators/suse121_libpng/Makefile
+++ b/emulators/suse121_libpng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:45 jperkin Exp $
 
-DISTNAME=	suse_libpng-${SUSE_VERSION}
+PKGNAME=	suse_libpng-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libpng14-14-1.4.11-3.12.1.${SUSE_ARCH}
diff --git a/emulators/suse121_libsigc++2/Makefile b/emulators/suse121_libsigc++2/Makefile
index 995c35fda0a..420f6f83e59 100644
--- a/emulators/suse121_libsigc++2/Makefile
+++ b/emulators/suse121_libsigc++2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_libsigc++2-${SUSE_VERSION}
+PKGNAME=	suse_libsigc++2-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libsigc-2_0-0-2.2.10-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_libtiff/Makefile b/emulators/suse121_libtiff/Makefile
index ad5123537c1..44c3a025bb3 100644
--- a/emulators/suse121_libtiff/Makefile
+++ b/emulators/suse121_libtiff/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_libtiff-${SUSE_VERSION}
+PKGNAME=	suse_libtiff-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libtiff3-3.9.5-8.17.1.${SUSE_ARCH}
diff --git a/emulators/suse121_libxml2/Makefile b/emulators/suse121_libxml2/Makefile
index 8c770fd281e..b8e69ce149a 100644
--- a/emulators/suse121_libxml2/Makefile
+++ b/emulators/suse121_libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_libxml2-${SUSE_VERSION}
+PKGNAME=	suse_libxml2-${SUSE_VERSION}
 PKGREVISION=	6
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libxml2-2.7.8+git20110708-3.24.1.${SUSE_ARCH}
diff --git a/emulators/suse121_linux/Makefile.common b/emulators/suse121_linux/Makefile.common
index d4b0f8a4401..a06f5534c94 100644
--- a/emulators/suse121_linux/Makefile.common
+++ b/emulators/suse121_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2015/02/11 09:38:15 obache Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/02/16 10:15:46 jperkin Exp $
 #
 # used by emulators/suse121_alsa/Makefile
 # used by emulators/suse121_alsa/Makefile
@@ -108,7 +108,7 @@ PATCHDIR=		${SUSE_PKGSRCDIR}/patches
 PKGDIR=			${SUSE_PKGSRCDIR}
 
 .if defined(SUSE_COMPAT32)
-PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
+PKGNAME:=		${PKGNAME:S/^suse_/suse32_/}
 COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
 .if defined(CONFLICTS)
 CONFLICTS:=		${CONFLICTS:S/^suse_/suse32_/}
diff --git a/emulators/suse121_locale/Makefile b/emulators/suse121_locale/Makefile
index ac4aaed29d2..284251de8c7 100644
--- a/emulators/suse121_locale/Makefile
+++ b/emulators/suse121_locale/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_locale-${SUSE_VERSION}
+PKGNAME=	suse_locale-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMUPDPKGS+=	glibc-locale-2.14.1-14.25.1.${SUSE_ARCH}
 
diff --git a/emulators/suse121_openmotif/Makefile b/emulators/suse121_openmotif/Makefile
index 6784dcf77d5..fcaa95e3bb5 100644
--- a/emulators/suse121_openmotif/Makefile
+++ b/emulators/suse121_openmotif/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_openmotif-${SUSE_VERSION}
+PKGNAME=	suse_openmotif-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	openmotif-libs-2.3.2-8.1.3.${SUSE_ARCH}
 
diff --git a/emulators/suse121_openssl/Makefile b/emulators/suse121_openssl/Makefile
index 73e035efa84..c7748275261 100644
--- a/emulators/suse121_openssl/Makefile
+++ b/emulators/suse121_openssl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_openssl-${SUSE_VERSION}
+PKGNAME=	suse_openssl-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libopenssl1_0_0-1.0.0k-34.20.1.${SUSE_ARCH}
diff --git a/emulators/suse121_qt4/Makefile b/emulators/suse121_qt4/Makefile
index 1839647b599..c3585071d1d 100644
--- a/emulators/suse121_qt4/Makefile
+++ b/emulators/suse121_qt4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_qt4-${SUSE_VERSION}
+PKGNAME=	suse_qt4-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libqt4-4.7.4-19.21.1.${SUSE_ARCH}
diff --git a/emulators/suse121_slang/Makefile b/emulators/suse121_slang/Makefile
index 741cd63baaa..618b57f0e02 100644
--- a/emulators/suse121_slang/Makefile
+++ b/emulators/suse121_slang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_slang-${SUSE_VERSION}
+PKGNAME=	suse_slang-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libslang2-2.2.2-6.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_sqlite3/Makefile b/emulators/suse121_sqlite3/Makefile
index ed0f26b8e68..7f25dabe50d 100644
--- a/emulators/suse121_sqlite3/Makefile
+++ b/emulators/suse121_sqlite3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_sqlite3-${SUSE_VERSION}
+PKGNAME=	suse_sqlite3-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libsqlite3-0-3.7.8-1.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse121_x11/Makefile b/emulators/suse121_x11/Makefile
index 11cef998e8b..8541f7c6245 100644
--- a/emulators/suse121_x11/Makefile
+++ b/emulators/suse121_x11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:46 jperkin Exp $
 
-DISTNAME=	suse_x11-${SUSE_VERSION}
+PKGNAME=	suse_x11-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libpixman-1-0-0.24.0-2.3.1.${SUSE_ARCH}
 RPMPKGS+=	libXi6-1.4.0-10.1.2.${SUSE_ARCH}
diff --git a/emulators/suse131_alsa/Makefile b/emulators/suse131_alsa/Makefile
index cc3e2a7a151..2e0d83dce11 100644
--- a/emulators/suse131_alsa/Makefile
+++ b/emulators/suse131_alsa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_alsa-${SUSE_VERSION}
+PKGNAME=	suse_alsa-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 RPMUPDPKGS+=	alsa-1.0.27.2-3.5.1.${SUSE_ARCH}
diff --git a/emulators/suse131_aspell/Makefile b/emulators/suse131_aspell/Makefile
index 6b189f6b18a..b97d1551b41 100644
--- a/emulators/suse131_aspell/Makefile
+++ b/emulators/suse131_aspell/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_aspell-${SUSE_VERSION}
+PKGNAME=	suse_aspell-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	aspell-0.60.6.1-14.1.4.${SUSE_ARCH}
 
diff --git a/emulators/suse131_base/Makefile b/emulators/suse131_base/Makefile
index c3b21b0fed7..5b64ae56588 100644
--- a/emulators/suse131_base/Makefile
+++ b/emulators/suse131_base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.13 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_base-${SUSE_VERSION}
+PKGNAME=	suse_base-${SUSE_VERSION}
 PKGREVISION=	7
 CATEGORIES=	emulators
 RPMUPDPKGS+=	aaa_base-${SUSE_VERSION}-16.46.1.${SUSE_ARCH}
diff --git a/emulators/suse131_compat/Makefile b/emulators/suse131_compat/Makefile
index 1f5f3180888..f7d8ce80c90 100644
--- a/emulators/suse131_compat/Makefile
+++ b/emulators/suse131_compat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_compat-${SUSE_VERSION}
+PKGNAME=	suse_compat-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libstdc++33-3.3.3-41.1.3.${SUSE_ARCH}
 
diff --git a/emulators/suse131_cyrus-sasl/Makefile b/emulators/suse131_cyrus-sasl/Makefile
index d4d6ddc721b..778ace0b3d9 100644
--- a/emulators/suse131_cyrus-sasl/Makefile
+++ b/emulators/suse131_cyrus-sasl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_cyrus-sasl-${SUSE_VERSION}
+PKGNAME=	suse_cyrus-sasl-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	cyrus-sasl-2.1.25-28.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_dbus-glib/Makefile b/emulators/suse131_dbus-glib/Makefile
index be1f395bb5d..a5a68777edc 100644
--- a/emulators/suse131_dbus-glib/Makefile
+++ b/emulators/suse131_dbus-glib/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD
 
-DISTNAME=	suse_dbus-glib-${SUSE_VERSION}
+PKGNAME=	suse_dbus-glib-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	dbus-1-glib-0.100.2-2.1.3.${SUSE_ARCH}
 
diff --git a/emulators/suse131_expat/Makefile b/emulators/suse131_expat/Makefile
index 2898a8f5ce0..f197a7425a1 100644
--- a/emulators/suse131_expat/Makefile
+++ b/emulators/suse131_expat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_expat-${SUSE_VERSION}
+PKGNAME=	suse_expat-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libexpat1-2.1.0-12.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_fontconfig/Makefile b/emulators/suse131_fontconfig/Makefile
index 52b1d2f9fbf..961f218cf7b 100644
--- a/emulators/suse131_fontconfig/Makefile
+++ b/emulators/suse131_fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGNAME=	suse_fontconfig-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	fontconfig-2.11.0-4.1.${SUSE_ARCH}
diff --git a/emulators/suse131_freetype2/Makefile b/emulators/suse131_freetype2/Makefile
index 63e4f81298d..9e1fcc22ab8 100644
--- a/emulators/suse131_freetype2/Makefile
+++ b/emulators/suse131_freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_freetype2-${SUSE_VERSION}
+PKGNAME=	suse_freetype2-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libfreetype6-2.5.0.1-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_glib2/Makefile b/emulators/suse131_glib2/Makefile
index 34825a972a7..08467fc221f 100644
--- a/emulators/suse131_glib2/Makefile
+++ b/emulators/suse131_glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_glib2-${SUSE_VERSION}
+PKGNAME=	suse_glib2-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	gio-branding-upstream-2.38.1-1.1.noarch
 RPMPKGS+=	glib2-tools-2.38.1-1.1.${SUSE_ARCH}
diff --git a/emulators/suse131_glx/Makefile b/emulators/suse131_glx/Makefile
index 7589e41723e..cb84b64dde5 100644
--- a/emulators/suse131_glx/Makefile
+++ b/emulators/suse131_glx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_glx-${SUSE_VERSION}
+PKGNAME=	suse_glx-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 RPMUPDPKGS+=	Mesa-9.2.3-61.9.1.${SUSE_ARCH}
diff --git a/emulators/suse131_gstreamer/Makefile b/emulators/suse131_gstreamer/Makefile
index 2aec379fc2c..b657fa52638 100644
--- a/emulators/suse131_gstreamer/Makefile
+++ b/emulators/suse131_gstreamer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_gstreamer-${SUSE_VERSION}
+PKGNAME=	suse_gstreamer-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMUPDPKGS+=	gstreamer-plugin-gstclutter-2.0.8-3.1.${SUSE_ARCH}
 RPMUPDPKGS+=	gstreamer-plugins-bad-1.0.10-2.5.4.${SUSE_ARCH}
diff --git a/emulators/suse131_gtk2/Makefile b/emulators/suse131_gtk2/Makefile
index 14d754f623c..946d1528b16 100644
--- a/emulators/suse131_gtk2/Makefile
+++ b/emulators/suse131_gtk2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:47 jperkin Exp $
 
-DISTNAME=	suse_gtk2-${SUSE_VERSION}
+PKGNAME=	suse_gtk2-${SUSE_VERSION}
 PKGREVISION=	5
 CATEGORIES=	emulators
 RPMPKGS+=	libcairo2-1.12.16-3.1.3.${SUSE_ARCH}
diff --git a/emulators/suse131_krb5/Makefile b/emulators/suse131_krb5/Makefile
index 1163d1a4210..5324c12a772 100644
--- a/emulators/suse131_krb5/Makefile
+++ b/emulators/suse131_krb5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_krb5-${SUSE_VERSION}
+PKGNAME=	suse_krb5-${SUSE_VERSION}
 PKGREVISION=	2
 CATEGORIES=	emulators
 RPMUPDPKGS+=	krb5-1.11.3-3.12.1.${SUSE_ARCH}
diff --git a/emulators/suse131_libSDL/Makefile b/emulators/suse131_libSDL/Makefile
index c0371ba97a7..e66950da67e 100644
--- a/emulators/suse131_libSDL/Makefile
+++ b/emulators/suse131_libSDL/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libSDL-${SUSE_VERSION}
+PKGNAME=	suse_libSDL-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libSDL-1_2-0-1.2.15-10.1.2.${SUSE_ARCH}
 RPMPKGS+=	libSDL_image-1_2-0-1.2.12-6.1.2.${SUSE_ARCH}
diff --git a/emulators/suse131_libaudiofile/Makefile b/emulators/suse131_libaudiofile/Makefile
index b3ea3bfad31..0a4e9187d84 100644
--- a/emulators/suse131_libaudiofile/Makefile
+++ b/emulators/suse131_libaudiofile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libaudiofile-${SUSE_VERSION}
+PKGNAME=	suse_libaudiofile-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libaudiofile1-0.3.6-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libcups/Makefile b/emulators/suse131_libcups/Makefile
index 01eb542c856..5f59bbc49e1 100644
--- a/emulators/suse131_libcups/Makefile
+++ b/emulators/suse131_libcups/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libcups-${SUSE_VERSION}
+PKGNAME=	suse_libcups-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	cups-libs-1.5.4-12.1.3.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libcurl/Makefile b/emulators/suse131_libcurl/Makefile
index 0ae4bad54be..c2a2d71a34e 100644
--- a/emulators/suse131_libcurl/Makefile
+++ b/emulators/suse131_libcurl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libcurl-${SUSE_VERSION}
+PKGNAME=	suse_libcurl-${SUSE_VERSION}
 PKGREVISION=	5
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libcurl4-7.32.0-2.31.1.${SUSE_ARCH}
diff --git a/emulators/suse131_libdbus/Makefile b/emulators/suse131_libdbus/Makefile
index f2017a4acf4..9264bfd0600 100644
--- a/emulators/suse131_libdbus/Makefile
+++ b/emulators/suse131_libdbus/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.11 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libdbus-${SUSE_VERSION}
+PKGNAME=	suse_libdbus-${SUSE_VERSION}
 PKGREVISION=	6
 CATEGORIES=	emulators
 RPMUPDPKGS+=	dbus-1-1.8.14-4.32.3.${SUSE_ARCH}
diff --git a/emulators/suse131_libdrm/Makefile b/emulators/suse131_libdrm/Makefile
index 4056bfae72c..a944408c220 100644
--- a/emulators/suse131_libdrm/Makefile
+++ b/emulators/suse131_libdrm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:17 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libdrm-${SUSE_VERSION}
+PKGNAME=	suse_libdrm-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libdrm2-2.4.46-3.2.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libesd/Makefile b/emulators/suse131_libesd/Makefile
index 4529c21e3cc..b941155184b 100644
--- a/emulators/suse131_libesd/Makefile
+++ b/emulators/suse131_libesd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libesd-${SUSE_VERSION}
+PKGNAME=	suse_libesd-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libesd0-0.2.41-26.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libffi/Makefile b/emulators/suse131_libffi/Makefile
index 8a244ce370b..e88a9724138 100644
--- a/emulators/suse131_libffi/Makefile
+++ b/emulators/suse131_libffi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libffi-${SUSE_VERSION}
+PKGNAME=	suse_libffi-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libffi4-4.8.1_20130909-3.2.1.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libidn/Makefile b/emulators/suse131_libidn/Makefile
index eafa9294e95..cbd79dadbaa 100644
--- a/emulators/suse131_libidn/Makefile
+++ b/emulators/suse131_libidn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libidn-${SUSE_VERSION}
+PKGNAME=	suse_libidn-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libidn11-1.25-7.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libjpeg/Makefile b/emulators/suse131_libjpeg/Makefile
index 08bac83106e..a0062da857f 100644
--- a/emulators/suse131_libjpeg/Makefile
+++ b/emulators/suse131_libjpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libjpeg-${SUSE_VERSION}
+PKGNAME=	suse_libjpeg-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libjpeg62-62.0.0-24.1.3.${SUSE_ARCH}
 RPMPKGS+=	libjpeg8-8.0.2-24.1.3.${SUSE_ARCH}
diff --git a/emulators/suse131_libjson/Makefile b/emulators/suse131_libjson/Makefile
index 65c8a132db9..5010a016287 100644
--- a/emulators/suse131_libjson/Makefile
+++ b/emulators/suse131_libjson/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libjson-${SUSE_VERSION}
+PKGNAME=	suse_libjson-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libjson0-0.10-3.4.1.${SUSE_ARCH}
diff --git a/emulators/suse131_libpng/Makefile b/emulators/suse131_libpng/Makefile
index eec5b2ed48a..f38dcf2d5bb 100644
--- a/emulators/suse131_libpng/Makefile
+++ b/emulators/suse131_libpng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libpng-${SUSE_VERSION}
+PKGNAME=	suse_libpng-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libpng12-0-1.2.50-6.4.1.${SUSE_ARCH}
diff --git a/emulators/suse131_libsigc++2/Makefile b/emulators/suse131_libsigc++2/Makefile
index 74cc27d4c13..ce6b2b83aab 100644
--- a/emulators/suse131_libsigc++2/Makefile
+++ b/emulators/suse131_libsigc++2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:48 jperkin Exp $
 
-DISTNAME=	suse_libsigc++2-${SUSE_VERSION}
+PKGNAME=	suse_libsigc++2-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libsigc-2_0-0-2.3.1-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libsndfile/Makefile b/emulators/suse131_libsndfile/Makefile
index 0aefc32d0f0..3d82cc545e8 100644
--- a/emulators/suse131_libsndfile/Makefile
+++ b/emulators/suse131_libsndfile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_libsndfile-${SUSE_VERSION}
+PKGNAME=	suse_libsndfile-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libsndfile1-1.0.25-17.4.1.${SUSE_ARCH}
diff --git a/emulators/suse131_libssh/Makefile b/emulators/suse131_libssh/Makefile
index 74598259cb9..1ed2baacbac 100644
--- a/emulators/suse131_libssh/Makefile
+++ b/emulators/suse131_libssh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_libssh-${SUSE_VERSION}
+PKGNAME=	suse_libssh-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libssh2-1-1.4.3-7.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libtiff/Makefile b/emulators/suse131_libtiff/Makefile
index 445c64f4e56..30791188bd4 100644
--- a/emulators/suse131_libtiff/Makefile
+++ b/emulators/suse131_libtiff/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_libtiff-${SUSE_VERSION}
+PKGNAME=	suse_libtiff-${SUSE_VERSION}
 PKGREVISION=	1
 CATEGORIES=	emulators
 RPMPKGS+=	libtiff5-4.0.3-8.1.2.${SUSE_ARCH}
diff --git a/emulators/suse131_libwrap/Makefile b/emulators/suse131_libwrap/Makefile
index 53d4d8a200c..c0abd24dca5 100644
--- a/emulators/suse131_libwrap/Makefile
+++ b/emulators/suse131_libwrap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_libwrap-${SUSE_VERSION}
+PKGNAME=	suse_libwrap-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libwrap0-7.6-881.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_libxml2/Makefile b/emulators/suse131_libxml2/Makefile
index 1b49a8e370a..82a114648ff 100644
--- a/emulators/suse131_libxml2/Makefile
+++ b/emulators/suse131_libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_libxml2-${SUSE_VERSION}
+PKGNAME=	suse_libxml2-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libxml2-2-2.9.1-2.16.1.${SUSE_ARCH}
diff --git a/emulators/suse131_linux/Makefile.common b/emulators/suse131_linux/Makefile.common
index f89c8fac81d..9cc7636c394 100644
--- a/emulators/suse131_linux/Makefile.common
+++ b/emulators/suse131_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/02/16 10:15:49 jperkin Exp $
 #
 # used by emulators/suse131_alsa/Makefile
 # used by emulators/suse131_aspell/Makefile
@@ -97,7 +97,7 @@ PATCHDIR=		${SUSE_PKGSRCDIR}/patches
 PKGDIR=			${SUSE_PKGSRCDIR}
 
 .if defined(SUSE_COMPAT32)
-PKGNAME:=		${DISTNAME:S/^suse_/suse32_/}
+PKGNAME:=		${PKGNAME:S/^suse_/suse32_/}
 COMMENT:=		${COMMENT:S/Linux/Linux 32-bit/}
 .if defined(CONFLICTS)
 CONFLICTS:=		${CONFLICTS:S/^suse_/suse32_/}
diff --git a/emulators/suse131_locale/Makefile b/emulators/suse131_locale/Makefile
index fcb9af1786f..ba44b9f083a 100644
--- a/emulators/suse131_locale/Makefile
+++ b/emulators/suse131_locale/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_locale-${SUSE_VERSION}
+PKGNAME=	suse_locale-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	glibc-locale-2.18-4.4.1.${SUSE_ARCH}
 
diff --git a/emulators/suse131_motif/Makefile b/emulators/suse131_motif/Makefile
index e82dd331763..e18b953aa47 100644
--- a/emulators/suse131_motif/Makefile
+++ b/emulators/suse131_motif/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_motif-${SUSE_VERSION}
+PKGNAME=	suse_motif-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	motif-2.3.4-2.1.3.${SUSE_ARCH}
 RPMPKGS+=	libMrm4-2.3.4-2.1.3.${SUSE_ARCH}
diff --git a/emulators/suse131_mozilla-nspr/Makefile b/emulators/suse131_mozilla-nspr/Makefile
index 9ba7688732d..567f84309e1 100644
--- a/emulators/suse131_mozilla-nspr/Makefile
+++ b/emulators/suse131_mozilla-nspr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_mozilla-nspr-${SUSE_VERSION}
+PKGNAME=	suse_mozilla-nspr-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	mozilla-nspr-4.10.7-16.1.${SUSE_ARCH}
diff --git a/emulators/suse131_mozilla-nss/Makefile b/emulators/suse131_mozilla-nss/Makefile
index b80d3658494..5320c740a9e 100644
--- a/emulators/suse131_mozilla-nss/Makefile
+++ b/emulators/suse131_mozilla-nss/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_mozilla-nss-${SUSE_VERSION}
+PKGNAME=	suse_mozilla-nss-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators
 RPMUPDPKGS+=	mozilla-nss-3.17.1-43.1.${SUSE_ARCH}
diff --git a/emulators/suse131_openldap/Makefile b/emulators/suse131_openldap/Makefile
index 009dbede3a9..673d4a80e35 100644
--- a/emulators/suse131_openldap/Makefile
+++ b/emulators/suse131_openldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_openldap-${SUSE_VERSION}
+PKGNAME=	suse_openldap-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libldap-2_4-2-2.4.33-8.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_openssl/Makefile b/emulators/suse131_openssl/Makefile
index dd6e10c3583..13838e9c10e 100644
--- a/emulators/suse131_openssl/Makefile
+++ b/emulators/suse131_openssl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.16 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_openssl-${SUSE_VERSION}
+PKGNAME=	suse_openssl-${SUSE_VERSION}
 PKGREVISION=	12
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libopenssl1_0_0-1.0.1k-11.64.2.${SUSE_ARCH}
diff --git a/emulators/suse131_pulseaudio/Makefile b/emulators/suse131_pulseaudio/Makefile
index 62c7339adae..83fd1210341 100644
--- a/emulators/suse131_pulseaudio/Makefile
+++ b/emulators/suse131_pulseaudio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:49 jperkin Exp $
 
-DISTNAME=	suse_pulseaudio-${SUSE_VERSION}
+PKGNAME=	suse_pulseaudio-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libpulse0-4.0.git.270.g9490a-20.1.${SUSE_ARCH}
diff --git a/emulators/suse131_qt4/Makefile b/emulators/suse131_qt4/Makefile
index d7b28900b22..1040339867d 100644
--- a/emulators/suse131_qt4/Makefile
+++ b/emulators/suse131_qt4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 10:15:50 jperkin Exp $
 
-DISTNAME=	suse_qt4-${SUSE_VERSION}
+PKGNAME=	suse_qt4-${SUSE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	emulators
 RPMUPDPKGS+=	libqt4-4.8.5-5.13.1.${SUSE_ARCH}
diff --git a/emulators/suse131_slang/Makefile b/emulators/suse131_slang/Makefile
index cb0d339fc8e..05cbcbfadcc 100644
--- a/emulators/suse131_slang/Makefile
+++ b/emulators/suse131_slang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/16 10:15:50 jperkin Exp $
 
-DISTNAME=	suse_slang-${SUSE_VERSION}
+PKGNAME=	suse_slang-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	libslang2-2.2.4-6.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_sqlite3/Makefile b/emulators/suse131_sqlite3/Makefile
index ed2dc5085ee..42e66930ad3 100644
--- a/emulators/suse131_sqlite3/Makefile
+++ b/emulators/suse131_sqlite3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/16 10:15:50 jperkin Exp $
 
-DISTNAME=	suse_sqlite3-${SUSE_VERSION}
+PKGNAME=	suse_sqlite3-${SUSE_VERSION}
 CATEGORIES=	emulators
 RPMPKGS+=	 libsqlite3-0-3.7.17-2.1.2.${SUSE_ARCH}
 
diff --git a/emulators/suse131_x11/Makefile b/emulators/suse131_x11/Makefile
index 51e8e4a6c5e..242f134d414 100644
--- a/emulators/suse131_x11/Makefile
+++ b/emulators/suse131_x11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/11 09:38:19 obache Exp $
+# $NetBSD: Makefile,v 1.10 2015/02/16 10:15:50 jperkin Exp $
 
-DISTNAME=	suse_x11-${SUSE_VERSION}
+PKGNAME=	suse_x11-${SUSE_VERSION}
 PKGREVISION=	5
 CATEGORIES=	emulators
 RPMPKGS+=	libFS6-1.0.5-2.1.2.${SUSE_ARCH}