Use "suse_linux/Makefile.application" to pick correct SuSE packages.

22 files changed, 86 insertions, 91 deletions

diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index 8db5eec52e6..be5d698b044 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/31 04:58:25 uebayasi Exp $
+# $NetBSD: Makefile,v 1.5 2002/04/04 12:29:46 tron Exp $
 
 DISTNAME=		stuffit520.611linux-i386
 PKGNAME=		stuffit-5.2.0.611
@@ -11,7 +11,7 @@ MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.aladdinsys.com/expander
 COMMENT=		Stuffit Archive Creator and Expander
 
-DEPENDS+=		suse_base>=6:../../emulators/suse_base
+DEPENDS+=		suse_base>=6:../../emulators/${SUSE_DIR_PREFIX}_base
 
 WRKSRC=			${WRKDIR}
 RESTRICTED=		"Redistribution not permitted"
@@ -37,4 +37,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/unstuff/* \
 		${PREFIX}/share/doc/stuffit/unstuff/
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile
index 61f0f6c7faf..d119ccea3a0 100644
--- a/audio/realplayer/Makefile
+++ b/audio/realplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/03/04 19:41:06 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/04/04 12:29:46 tron Exp $
 
 DISTNAME=		rp8_linux20_libc6_i386_cs2
 PKGNAME=		realplayer-8.0.1
@@ -11,7 +11,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.real.com/products/player/
 COMMENT=		RealAudio and RealVideo player
 
-DEPENDS+=		suse_x11>=6.1:../../emulators/suse_x11
+DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -78,4 +78,4 @@ post-install:
 	${INSTALL_DATA} ${REALPLAYER_HOME}/raclass.zip ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${REALPLAYER_HOME}/rpnp.so ${NS_PLUGINS_DIR}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 1ab7420c92f..7ded83037f8 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/05 16:49:09 dillo Exp $
+# $NetBSD: Makefile,v 1.5 2002/04/04 12:29:46 tron Exp $
 #
 
 DISTNAME=		eagle-4.03e
@@ -12,7 +12,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		easy to use printed circuit board editor
 
-DEPENDS+=		suse_x11>=6.1:../../emulators/suse_x11
+DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 CHECK_SHLIBS=		NO		# this is Linux software
@@ -34,4 +34,5 @@ do-install:
 	cd ${WRKSRC} && ${CP} -R ${WRKSRC}/* ${PREFIX}/eagle
 	${INSTALL_SCRIPT} ${WRKDIR}/eagle ${PREFIX}/bin
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index badaf40f5f6..44f66b3dee5 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/22 18:40:00 fredb Exp $
-#
+# $NetBSD: Makefile,v 1.2 2002/04/04 12:29:47 tron Exp $
 
 DISTNAME=	aim-1.5.234
 CATEGORIES=	chat
@@ -11,10 +10,10 @@ HOMEPAGE=	http://www.aim.com/
 COMMENT=	AOL Instant Messenger (SM)
 
 BUILD_DEPENDS+=	rpm2pkg-1.2:../../pkgtools/rpm2pkg
-DEPENDS+=	suse_base>=6.4:../../emulators/suse_base
-DEPENDS+=	suse_compat>=6.4:../../emulators/suse_compat
-DEPENDS+=	suse_x11>=6.4:../../emulators/suse_x11
-DEPENDS+=	suse_gtk>=6.4:../../emulators/suse_gtk
+DEPENDS+=	suse_base>=6.4:../../emulators/${SUSE_DIR_PREFIX}_base
+DEPENDS+=	suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=	suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+=	suse_gtk>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gtk
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386
 
@@ -31,4 +30,4 @@ do-install:
 		-p emul/linux ${DISTDIR}/${DISTFILES}
 	${LN} -s ${PREFIX}/emul/linux/usr/local/bin/aim ${PREFIX}/bin/aim
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index d168feb4a4d..43cbf305297 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/20 04:10:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/04 12:29:47 tron Exp $
 
 DISTNAME=		ymessenger-0.93.0
 CATEGORIES=		chat
@@ -9,8 +9,8 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://messenger.yahoo.com/
 COMMENT=		Yahoo! instant messaging client
 
-DEPENDS+=		suse_compat>=6.4:../../emulators/suse_compat
-DEPENDS+=		suse_gtk>=6.4:../../emulators/suse_gtk
+DEPENDS+=		suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=		suse_gtk>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gtk
 
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
 			NetBSD-1.5_ALPHA-i386 NetBSD-1.[5-9]*-i386
@@ -33,4 +33,4 @@ RPMFILES=		${DISTFILES}
 post-install:
 	${LN} -fs ../${EMULSUBDIR}/usr/local/bin/ymessenger ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index dd6f08c4f4b..b126fc6c850 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/02/07 11:39:52 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2002/04/04 12:29:47 tron Exp $
 
 DISTNAME=	civctp-demo-10251999
 PKGNAME=	civctp-demo-19991025
@@ -19,7 +18,8 @@ ONLY_FOR_PLATFORM=*-*-i386
 
 .if (${MACHINE_ARCH} == "i386")
 BINTYPE=	x86/glibc-2.1
-# DEPENDS+=	suse_base>=6.1:../../emulators/suse_base
+
+DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 .elif (${MACHINE_ARCH} == "alpha")
 BINTYPE=	alpha/glibc-2.1
 .elif (${MACHINE_ARCH} == "powerpc")
@@ -52,4 +52,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} ; ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index b0c5264b7e0..096a3108bf9 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/02/07 11:39:52 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2002/04/04 12:29:47 tron Exp $
 
 DISTNAME=	eus-demo
 PKGNAME=	eus-demo-1.0
@@ -19,7 +18,8 @@ ONLY_FOR_PLATFORM=*-*-i386
 
 .if (${MACHINE_ARCH} == "i386")
 BINTYPE=	x86/glibc-2.1
-# DEPENDS+=	suse_base>=6.1:../../emulators/suse_base
+
+DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 .elif (${MACHINE_ARCH} == "alpha")
 BINTYPE=	alpha/glibc-2.1
 .elif (${MACHINE_ARCH} == "powerpc")
@@ -52,4 +52,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} ; ${PAX} -rw [Eai-p]* sounds ${LIBDIR}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 44568b0fbb1..9b30c477dc2 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/02/24 17:03:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2002/04/04 12:29:47 tron Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGNAME=	quake3arena-demo-1.11.6
@@ -12,8 +11,8 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.quake3arena.com/
 COMMENT=	Quake 3 Arena -- first person shooter (linux demo)
 
-DEPENDS+=	suse_linux>=6.3:../../emulators/suse_linux
-DEPENDS+=	suse_glx>=6.4:../../emulators/suse_glx
+DEPENDS+=	suse_linux>=6.3:../../emulators/${SUSE_DIR_PREFIX}_linux
+DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
 
 CONFLICTS=	quake3arena-[0-9]*
 
@@ -56,4 +55,5 @@ do-install:
 	cd ${WRKSRC} ; ${PAX} -rw Help ${SHAREDIR}
 	${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 5af1833549f..106cbc14825 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/02/28 00:31:46 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2002/04/04 12:29:48 tron Exp $
 
 DISTNAME=	linuxq3apoint-1.17.x86
 PKGNAME=	quake3arena-1.17
@@ -13,9 +12,9 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.quake3arena.com/
 COMMENT=	Quake 3 Arena -- first person shooter (binary only, no data files)
 
-DEPENDS+=	suse_base>=6.3:../../emulators/suse_base
-DEPENDS+=	suse_x11>=6.3:../../emulators/suse_x11
-DEPENDS+=	suse_glx>=6.4:../../emulators/suse_glx
+DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
+DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
 
 CONFLICTS=	quake3arena-demo-[0-9]*
 
@@ -62,4 +61,5 @@ do-install:
 	cd ${WRKSRC} ; ${PAX} -rw Help ${SHAREDIR}
 	${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 70fe8ba64c4..ca74a763d48 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/12/05 15:00:46 agc Exp $
-#
+# $NetBSD: Makefile,v 1.19 2002/04/04 12:29:48 tron Exp $
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
@@ -36,8 +35,8 @@ ONLY_FOR_PLATFORM=	*-*-i386
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-DEPENDS=	suse_compat>=6.1:../../emulators/suse_compat
-DEPENDS=	suse_x11>=6.1:../../emulators/suse_x11
+DEPENDS=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 CHECK_SHLIBS=	no
 .endif
 
@@ -68,4 +67,4 @@ do-install:
 	@${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Upload
 	@${CHMOD} 664 ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 2295a97b163..a75c190b0a7 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:34 hubertf Exp $
-#
+# $NetBSD: Makefile,v 1.11 2002/04/04 12:29:48 tron Exp $
 
 PKGNAME=	blender-2.11
 PKGREVISION=	4
@@ -27,7 +26,7 @@ IGNORE=		"${PKGNAME} requires Linux libraries - see compat_linux(8)"
 DISTNAME=	blender2.11-linux-glibc2.1.3-alpha
 #
 .elif (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_linux>=6.4:../../emulators/suse_linux
+DEPENDS+=	suse_linux>=6.4:../../emulators/${SUSE_DIR_PREFIX}_linux
 DISTNAME=	blender2.11-linux-glibc2.1.2-i386-static
 PLIST_ARCH=	linux-i386
 #
@@ -58,4 +57,4 @@ do-install:
 	${CP} -Rp ${WRKSRC}/* ${PREFIX}/lib/blender/
 	${LN} -sf ../lib/blender/blender ${PREFIX}/bin/blender
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index 56f0906e73d..6b74792cc6b 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/04/04 10:01:31 tron Exp $
+# $NetBSD: Makefile,v 1.32 2002/04/04 12:29:48 tron Exp $
 
 DISTNAME=		mtv-1.2.5
 CATEGORIES=		graphics
@@ -35,4 +35,4 @@ post-install:
 .endfor
 	${CHMOD} +x ${PREFIX}/emul/linux/usr/doc/mtv
 
-.include "../../emulators/suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index 4a5259fb60c..f37b5d8c1b1 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/03/21 07:38:35 martti Exp $
-#
+# $NetBSD: Makefile,v 1.15 2002/04/04 12:29:48 tron Exp $
 
 ONLY_FOR_PLATFORM=      *-*-i386 SunOS-*-sparc
 
@@ -7,8 +6,8 @@ ONLY_FOR_PLATFORM=      *-*-i386 SunOS-*-sparc
 
 .if (${MACHINE_ARCH} == "i386")
 FLASH_VERS=		5.0r47
-DEPENDS+=		suse_compat>=6.3:../../emulators/suse_compat
-DEPENDS+=		suse_x11>=6.3:../../emulators/suse_x11
+DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DISTUNAME=		linux
 WRKNAME=		flash_linux
 .elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
@@ -54,4 +53,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ShockwaveFlash.class ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index d9fcec5e23e..37b1d1cb35d 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/03/19 16:33:58 tron Exp $
+# $NetBSD: Makefile,v 1.20 2002/04/04 12:29:49 tron Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2re-1_3_1_02-linux-i386
@@ -28,8 +28,8 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 
 # Needs to be after bsd.prefs.mk
 .if ${OPSYS} != "Linux"
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/suse_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/suse_x11
+DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
 .if !defined(JDK_HOME)
@@ -60,7 +60,7 @@ do-install:
 	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
 	${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX}/jre -xpf-
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
 # These need to be after bsd.pkg.mk 
 
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 64c8136f61f..8c578d5a190 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/10/26 14:31:30 agc Exp $
-#
+# $NetBSD: Makefile,v 1.23 2002/04/04 12:29:49 tron Exp $
 
 DISTNAME=		so51a_lnx_${LANGNO}
 PKGNAME=		staroffice-${LANGUAGE}-5.1a
@@ -13,7 +12,7 @@ HOMEPAGE=		http://www.sun.com/staroffice/
 COMMENT=		Integrated office suite
 
 BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
-DEPENDS+=		suse_linux>=6.1:../../emulators/suse_linux
+DEPENDS+=		suse_linux>=6.1:../../emulators/${SUSE_DIR_PREFIX}_linux
 
 CONFLICTS=		staroffice-[0-9]*
 
@@ -141,4 +140,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/bin
 .endfor
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 11770ce1bf1..27dc9b1e270 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/03/17 03:37:56 jmc Exp $
-#
+# $NetBSD: Makefile,v 1.9 2002/04/04 12:29:49 tron Exp $
 
 # A default so lintpkgsrc is happy
 PKGNAME=	citrix_ica-6.20
@@ -22,7 +21,7 @@ HOMEPAGE=	http://www.citrix.com/products/clients/ica/technology.asp
 COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server
 
 .if (${MACHINE_ARCH} == "i386")
-DEPENDS=	suse_x11>=6.4:../../emulators/suse_x11
+DEPENDS=	suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc
@@ -79,4 +78,4 @@ do-install:
 		< ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed
 	${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index dd0315dffe5..5200f437f8b 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/03/14 03:14:46 lukem Exp $
-# FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $
+# $NetBSD: Makefile,v 1.29 2002/04/04 12:29:49 tron Exp $
 
 PKGNAME=	acroread-4.05
 CATEGORIES=	print
@@ -25,7 +24,7 @@ SHLIB_HANDLING=	NO
 
 .if ${OPSYS} == "NetBSD"
 .if (${MACHINE_ARCH} == "i386")
-DEPENDS=	suse_x11>=6.1:../../emulators/suse_x11
+DEPENDS=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 DISTNAME=	linux-ar-405
 PLATFORM=	intellinux
 WRKSRC=		${WRKDIR}/ILINXR.install
@@ -92,4 +91,4 @@ post-install:
 	done
 .endif
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 6a6ea1c3ec7..76d20d54972 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/03/14 03:14:47 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2002/04/04 12:29:49 tron Exp $
 
 PKGNAME=	acroread3-3.01
 CATEGORIES=	print
@@ -21,8 +21,8 @@ NO_BUILD=	YES
 
 .if ${OPSYS} == "NetBSD"
 .if (${MACHINE_ARCH} == "i386")
-DEPENDS=	suse_libc5>=6.3:../../emulators/suse_libc5
-DEPENDS=	suse_x11>=6.3:../../emulators/suse_x11
+DEPENDS=	suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
+DEPENDS=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DISTNAME=	acroread_linux_301
 PLATFORM=	intellinux
 CHECK_SHLIBS=	no
@@ -78,4 +78,5 @@ post-install:
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${PREFIX}/Acrobat3/Reader/License.pdf"
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index c81c3ad75c3..3c44260326c 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/12/27 14:12:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/04/04 12:29:50 tron Exp $
 
 DISTNAME=		vlnx416e
 PKGNAME=		uvscan-4.16.0
@@ -10,7 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.mcafeeb2b.com/products/virusscan/default.asp
 COMMENT=		evaluation version of a DOS/Windows file virus scanner
 
-DEPENDS+=		suse_compat>=6.1:../../emulators/suse_compat
+DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=		uvscan-dat>=4171:../../security/uvscan-dat
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
@@ -54,4 +54,5 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};		\
 	done
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 7a8af66fade..0ec330f1e40 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/04 19:41:08 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/04/04 12:29:50 tron Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -11,9 +11,9 @@ MAINTAINER=		ad@netbsd.org
 HOMEPAGE=		http://opensource.adaptec.com/
 COMMENT=		Adaptec Storage Management software
 
-DEPENDS+=		suse_compat>=6.1:../../emulators/suse_compat
-DEPENDS+=		suse_x11>=6.1:../../emulators/suse_x11
-BUILD_DEPENDS+=		rpm2pkg>=1.2:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+=		rpm>=2.5.4:../../misc/rpm
+DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
@@ -84,4 +84,5 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/dpteng ${PREFIX}/etc/rc.d/dpteng
 	${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${PREFIX}/etc/rc.d/dptelog
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
+
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index 3d3461f3841..88f7e1975df 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:21:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.8 2002/04/04 12:29:50 tron Exp $
 
 DISTNAME=		${PKGNAME}-i386.linux
 PKGNAME=		asWedit-4.0.1
@@ -15,7 +14,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.advasoft.com/asWedit.html
 COMMENT=		Motif HTML and text editor
 
-DEPENDS+=		suse_libc5>=6.1:../../emulators/suse_libc5
+DEPENDS+=		suse_libc5>=6.1:../../emulators/${SUSE_DIR_PREFIX}_libc5
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
@@ -45,4 +44,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/asWedit
 .endfor
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 18c08dd8ae5..f84df4118dc 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:53 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.9 2002/04/04 12:29:50 tron Exp $
 
 DISTNAME=		plugger-3.2-linux-x86-glibc
 PKGNAME=		ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS}
@@ -18,7 +17,7 @@ DEPENDS+=		${BINNAME}-[0-9]*:../../www/${BINNAME}
 MOZILLA_HOME=		${PREFIX}/lib/netscape/${NSNAME:C/nb[0-9]+$//}
 PLIST_SUBST+=		MOZILLA_HOME=${MOZILLA_HOME:S/${PREFIX}\///}
 .else
-DEPENDS+=		suse_base>=6.3:../../emulators/suse_base
+DEPENDS+=		suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
 .endif
 
 CONFLICTS+=		plugger-[0-9]*	# obsolete all-in-one plugger package
@@ -48,7 +47,7 @@ do-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR}
 .endif
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../emulators/suse_linux/Makefile.application"
 
 .if ${BINNAME} != common
 NSNAME!=	${PKG_INFO} -e ${BINNAME} || ${ECHO}