From d928b8f223d75ad5ec56496e1cd38fce23946ac2 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Wed, 26 Mar 2003 04:05:37 +0000
Subject: De-confusify:  Let emulators/suse_*/Makefile.* _not_ include
 bsd.pkg.mk, but rather make all packages that use linux emulation include
 bsd.pkg.mk as the last files just like any normal package.

---
 www/asWedit/Makefile              | 3 ++-
 www/communicator/Makefile         | 3 ++-
 www/navigator/Makefile            | 3 ++-
 www/netscape/Makefile             | 3 ++-
 www/netscape7/Makefile            | 6 +++---
 www/netscape7/Makefile.Linux.i386 | 4 +---
 www/ns-plugger-common/Makefile    | 4 +++-
 www/opera-plugins/Makefile        | 3 ++-
 www/opera/Makefile                | 8 +++-----
 www/opera6/Makefile               | 4 +++-
 www/phoenix-linux/Makefile        | 5 ++---
 11 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'www')

diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index 88f7e1975df..0d34902e432 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/04/04 12:29:50 tron Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/26 04:05:40 jschauma Exp $
 
 DISTNAME=		${PKGNAME}-i386.linux
 PKGNAME=		asWedit-4.0.1
@@ -45,3 +45,4 @@ do-install:
 .endfor
 
 .include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index d46fca88310..23f5d088851 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/09/20 16:59:27 abs Exp $
+# $NetBSD: Makefile,v 1.33 2003/03/26 04:05:40 jschauma Exp $
 #
 
 COMMENT=	Netscape communicator - Digital UNIX/Linux/SunOS binary
@@ -7,3 +7,4 @@ BINNAME=	communicator
 DIST_SDIR_NAME=	complete_install
 
 .include "../navigator/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index a9d702c5578..720135a0f28 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/09/20 16:59:27 abs Exp $
+# $NetBSD: Makefile,v 1.29 2003/03/26 04:05:40 jschauma Exp $
 #
 
 COMMENT=	Netscape navigator browser - Digital UNIX/Linux/SunOS binary
@@ -7,3 +7,4 @@ BINNAME=	navigator
 DIST_SDIR_NAME=	navigator_standalone
 
 .include "../navigator/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index 932c2fb3af4..dcecba4c40a 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/13 15:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/26 04:05:40 jschauma Exp $
 #
 
 COMMENT=	Open new communicator, navigator, or mozilla window
@@ -38,3 +38,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${PREFIX}/bin/netscape
 
 .include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index ef738089ce8..d79c88ab292 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 20:05:39 abs Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/26 04:05:39 jschauma Exp $
 #
 
 DISTNAME=		netscape-i686-pc-linux-gnu-sea
@@ -94,6 +94,6 @@ ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
 .if exists(Makefile.${OPSYS}.${ARCH})
 .  include "Makefile.${OPSYS}.${ARCH}"
-.else
-.  include "../../mk/bsd.pkg.mk"
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/netscape7/Makefile.Linux.i386 b/www/netscape7/Makefile.Linux.i386
index a89fc12330b..4d1014d07ee 100644
--- a/www/netscape7/Makefile.Linux.i386
+++ b/www/netscape7/Makefile.Linux.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Linux.i386,v 1.7 2002/10/14 14:22:50 jschauma Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.8 2003/03/26 04:05:39 jschauma Exp $
 #
 
 DIST_DIR_NAME=		linux22
@@ -19,5 +19,3 @@ post-extract:
 	${MV} ${WRKSRC}/netscape-installer.tmp ${WRKSRC}/netscape-installer
 	${LN} -s ${PREFIX}/lib/libglib.so ${WRKSRC}/dest/libglib-1.2.so.0
 	${LN} -s ${PREFIX}/lib/libgmodule.so ${WRKSRC}/dest/libgmodule-1.2.so.0
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 73bd58807b4..3bea1da0361 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/05 04:27:10 rh Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/26 04:05:39 jschauma Exp $
 
 DISTNAME=		plugger-4.0-linux-x86-glibc
 PKGNAME=		ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS}
@@ -53,3 +53,5 @@ do-install:
 .if ${BINNAME} != common
 NSNAME!=	${PKG_INFO} -e ${BINNAME} || ${ECHO}
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-plugins/Makefile b/www/opera-plugins/Makefile
index 6fd51247555..d858471a139 100644
--- a/www/opera-plugins/Makefile
+++ b/www/opera-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/14 13:05:18 tron Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:39 jschauma Exp $
 
 DISTNAME=	opera-plugins-1.0
 CATEGORIES=	www
@@ -39,3 +39,4 @@ do-install:
 		done
 
 .include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 25109fc3ae1..00492b0b1be 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/02/07 01:10:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.29 2003/03/26 04:05:39 jschauma Exp $
 
 DISTNAME=	opera-5.0.1
 CATEGORIES=	www
@@ -42,7 +42,6 @@ DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
 
 OPERA_ARCH=	ppc
 
-.include "../../mk/bsd.pkg.mk"
 .elif (${OPSYS} == SunOS && ${MACHINE_ARCH} == sparc)
 OPERA_ARCH=	sparc
 OPERA_DIR=	unix/solaris
@@ -61,7 +60,6 @@ do-install:
 	mv ${PREFIX}/bin/opera ${PREFIX}/libexec/opera
 	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
 
-.include "../../mk/bsd.pkg.mk"
-.else
-.include "../../mk/bsd.pkg.mk"
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera6/Makefile b/www/opera6/Makefile
index 46ae563c0b8..1edb7f0421f 100644
--- a/www/opera6/Makefile
+++ b/www/opera6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/12/05 08:12:42 tron Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/26 04:05:38 jschauma Exp $
 
 DISTNAME=	opera-${OPERA_PKG_VERSION}
 CATEGORIES=	www
@@ -65,3 +65,5 @@ post-install-manpage:
 	${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera \
 	  ${PREFIX}/man/man1
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-linux/Makefile b/www/phoenix-linux/Makefile
index 5134928fbf4..8cbdef59b07 100644
--- a/www/phoenix-linux/Makefile
+++ b/www/phoenix-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/17 11:33:50 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:37 jschauma Exp $
 #
 
 DISTNAME=		phoenix-0.5-i686-pc-linux-gnu
@@ -46,7 +46,6 @@ ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
 .if exists(Makefile.${OPSYS}.${ARCH})
 .  include "Makefile.${OPSYS}.${ARCH}"
-.else
-.  include "../../mk/bsd.pkg.mk"
 .endif
 
+.include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3