diff options
70 files changed, 148 insertions, 104 deletions
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile index 43e057dfb11..b43abe19f94 100644 --- a/archivers/stuffit/Makefile +++ b/archivers/stuffit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/12/24 18:55:33 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:53 jschauma Exp $ DISTNAME= stuffit520.611linux-i386 PKGNAME= stuffit-5.2.0.611 @@ -39,3 +39,4 @@ do-install: ${PREFIX}/share/doc/stuffit/unstuff/ .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile index 4fb3627c939..f830d78b235 100644 --- a/archivers/unace22/Makefile +++ b/archivers/unace22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/27 10:29:03 dillo Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:52 jschauma Exp $ # DISTNAME= linunace22 @@ -34,3 +34,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin/unace22 .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile index cdc0644d57a..f3c1ed48a5b 100644 --- a/audio/realplayer/Makefile +++ b/audio/realplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/12/07 02:38:52 schmonz Exp $ +# $NetBSD: Makefile,v 1.17 2003/03/26 04:05:52 jschauma Exp $ PKGNAME= realplayer-8.0.1 WRKSRC= ${WRKDIR}/RealPlayer8 @@ -95,3 +95,4 @@ post-install: ${INSTALL_DATA} ${REALPLAYER_HOME}/rpnp.so ${NS_PLUGINS_DIR} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile index 10c85b516a4..3d392a1ef17 100644 --- a/cad/eagle/Makefile +++ b/cad/eagle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/09/13 21:35:17 rh Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:52 jschauma Exp $ # DISTNAME= eagle-4.09r2e @@ -35,4 +35,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/eagle ${PREFIX}/bin .include "../../emulators/suse_linux/Makefile.application" - +.include "../../mk/bsd.pkg.mk" diff --git a/chat/aim/Makefile b/chat/aim/Makefile index 2a8dbb5f081..1593a3a6468 100644 --- a/chat/aim/Makefile +++ b/chat/aim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/02/14 01:29:19 fredb Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:52 jschauma Exp $ DISTNAME= aim-1.5.277 CATEGORIES= chat @@ -31,3 +31,4 @@ do-install: ${LN} -s ${PREFIX}/emul/linux/usr/local/bin/aim ${PREFIX}/bin/aim .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile index ecf29d47173..efe2ab9eb8e 100644 --- a/chat/ymessenger/Makefile +++ b/chat/ymessenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/07/17 20:53:23 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/03/26 04:05:51 jschauma Exp $ DISTNAME= ymessenger-0.93.0 CATEGORIES= chat @@ -36,3 +36,4 @@ post-install: ${LN} -fs ../${EMULSUBDIR}/usr/local/bin/ymessenger ${PREFIX}/bin .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile index e9f5c225b68..4d4b523885e 100644 --- a/emulators/linux-locale/Makefile +++ b/emulators/linux-locale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/04/05 09:36:44 tron Exp $ +# $NetBSD: Makefile,v 1.16 2003/03/26 04:05:51 jschauma Exp $ DISTNAME= locales-2.1-1mdk PKGNAME= linux-locale-2.1.1 @@ -62,3 +62,4 @@ post-install: @${CAT} ${CPIOLIST}|${GREP} "^d"|${SED} -e "s|.* \(usr\/.*\)|@dirrm ${EMULSUBDIR}/\1|"|sort -r >> ${PLIST_SRC} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_audio/Makefile b/emulators/suse64_audio/Makefile index 22bbe1267da..02725161c40 100644 --- a/emulators/suse64_audio/Makefile +++ b/emulators/suse64_audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:51 jschauma Exp $ DISTNAME= suse_audio-${SUSE_VERSION} CATEGORIES= emulators @@ -20,3 +20,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= audiofil.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_base/Makefile b/emulators/suse64_base/Makefile index 562ab455b8d..e03fcdbec9d 100644 --- a/emulators/suse64_base/Makefile +++ b/emulators/suse64_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/03/22 01:22:29 dillo Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:51 jschauma Exp $ DISTNAME= suse_base-${SUSE_VERSION} PKGREVISION= 8 @@ -57,3 +57,4 @@ do-install: @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_compat/Makefile b/emulators/suse64_compat/Makefile index 2045b73182a..fc6e51b2e4c 100644 --- a/emulators/suse64_compat/Makefile +++ b/emulators/suse64_compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:51 jschauma Exp $ DISTNAME= compat PKGNAME= suse_compat-${SUSE_VERSION} @@ -24,3 +24,4 @@ post-install: ${ECHO} "${EMULSUBDIR}/usr/lib/libncurses.so.2.1" >>${PLIST_SRC} .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_devel/Makefile b/emulators/suse64_devel/Makefile index 4d9f1804f49..2085e97cc3f 100644 --- a/emulators/suse64_devel/Makefile +++ b/emulators/suse64_devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/02 15:36:51 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= suse_devel-${SUSE_VERSION} PKGREVISION= 1 @@ -23,3 +23,4 @@ RPMFILES= bin86.rpm binutils.rpm g77.rpm gcc.rpm gpp.rpm \ libc-2.1.3-204.i386.rpm linclude.rpm make.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_glx/Makefile b/emulators/suse64_glx/Makefile index 8d38d78656e..ce5912ca8ed 100644 --- a/emulators/suse64_glx/Makefile +++ b/emulators/suse64_glx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/04 01:57:48 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= suse_glx-${SUSE_VERSION} PKGREVISION= 1 @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= glx-000229-53.i386.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk.bsd.pkg.mk" diff --git a/emulators/suse64_gtk/Makefile b/emulators/suse64_gtk/Makefile index 1c34bbff612..3cc0f16fc37 100644 --- a/emulators/suse64_gtk/Makefile +++ b/emulators/suse64_gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= suse_gtk-${SUSE_VERSION} CATEGORIES= emulators @@ -20,3 +20,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= glib.rpm gtk.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_libc5/Makefile b/emulators/suse64_libc5/Makefile index c5d5d10dfc1..afb3d3b49c9 100644 --- a/emulators/suse64_libc5/Makefile +++ b/emulators/suse64_libc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= shlibs5 PKGNAME= suse_libc5-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_libjpeg/Makefile b/emulators/suse64_libjpeg/Makefile index 61da83c51ed..479f5447a75 100644 --- a/emulators/suse64_libjpeg/Makefile +++ b/emulators/suse64_libjpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/04 02:00:12 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= suse_libjpeg-${SUSE_VERSION} PKGREVISION= 1 @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= libjpeg-6.2.0-62.i386.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_libpng/Makefile b/emulators/suse64_libpng/Makefile index 33e54f143ae..6062d0beb5e 100644 --- a/emulators/suse64_libpng/Makefile +++ b/emulators/suse64_libpng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:50 jschauma Exp $ DISTNAME= suse_libpng-${SUSE_VERSION} CATEGORIES= emulators @@ -20,3 +20,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= libpng.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_linux/Makefile.common b/emulators/suse64_linux/Makefile.common index 92e8adb1703..74cd3c51e81 100644 --- a/emulators/suse64_linux/Makefile.common +++ b/emulators/suse64_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/12/09 21:16:59 tron Exp $ +# $NetBSD: Makefile.common,v 1.4 2003/03/26 04:05:49 jschauma Exp $ SUSE_VERSION= 6.4 @@ -44,5 +44,3 @@ do-install: show-shlib-type: @${ECHO} linux-${MACHINE_ARCH} - -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_vmware/Makefile b/emulators/suse64_vmware/Makefile index a0c4b1803cb..1858ed6fbda 100644 --- a/emulators/suse64_vmware/Makefile +++ b/emulators/suse64_vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/04/04 10:29:51 tron Exp $ +# $NetBSD: Makefile,v 1.3 2003/03/26 04:05:49 jschauma Exp $ DISTNAME= suse_vmware-${SUSE_VERSION} PKGREVISION= 1 @@ -36,3 +36,4 @@ post-install: >>${PLIST_SRC} .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_x11/Makefile b/emulators/suse64_x11/Makefile index 55c93318ed5..61a9c00b4f3 100644 --- a/emulators/suse64_x11/Makefile +++ b/emulators/suse64_x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/04 01:53:35 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:49 jschauma Exp $ DISTNAME= suse_x11-${SUSE_VERSION} PKGREVISION= 1 @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= xshared-3.3.6-43.i386.rpm xpm.rpm .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse64_xforms/Makefile b/emulators/suse64_xforms/Makefile index 5723589c250..93a0f8d6d6e 100644 --- a/emulators/suse64_xforms/Makefile +++ b/emulators/suse64_xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:49 jschauma Exp $ DISTNAME= xforms PKGNAME= suse_xforms-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse64_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_audio/Makefile b/emulators/suse_audio/Makefile index c505429f00a..5afd4bec730 100644 --- a/emulators/suse_audio/Makefile +++ b/emulators/suse_audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/11/25 11:01:13 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:48 jschauma Exp $ DISTNAME= audiofile PKGNAME= suse_audio-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile index f4178adf500..324a3372827 100644 --- a/emulators/suse_base/Makefile +++ b/emulators/suse_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/03/22 01:22:30 dillo Exp $ +# $NetBSD: Makefile,v 1.38 2003/03/26 04:05:48 jschauma Exp $ DISTNAME= suse_base-${SUSE_VERSION} PKGREVISION= 3 @@ -66,3 +66,4 @@ do-install: @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile index 1129b0fa682..157d0575369 100644 --- a/emulators/suse_compat/Makefile +++ b/emulators/suse_compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/11/25 11:01:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.16 2003/03/26 04:05:48 jschauma Exp $ DISTNAME= compat PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_devel/Makefile b/emulators/suse_devel/Makefile index 76595a116f2..7b9d3a619ed 100644 --- a/emulators/suse_devel/Makefile +++ b/emulators/suse_devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/11/25 11:01:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.16 2003/03/26 04:05:48 jschauma Exp $ DISTNAME= suse_devel-${SUSE_VERSION} CATEGORIES= emulators @@ -34,3 +34,4 @@ RPMFILES+= glibc.rpm .endif .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_glx/Makefile b/emulators/suse_glx/Makefile index 0cdeccfa919..5ca1cc08f4d 100644 --- a/emulators/suse_glx/Makefile +++ b/emulators/suse_glx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/11/25 11:01:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2003/03/26 04:05:48 jschauma Exp $ DISTNAME= glx PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_gtk/Makefile b/emulators/suse_gtk/Makefile index 9e084e7fd94..3df6b728a1d 100644 --- a/emulators/suse_gtk/Makefile +++ b/emulators/suse_gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/11/25 11:01:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/26 04:05:47 jschauma Exp $ DISTNAME= suse_gtk-${SUSE_VERSION} CATEGORIES= emulators @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= glib.rpm gtk.rpm .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_libc5/Makefile b/emulators/suse_libc5/Makefile index 1e68a77494c..7c2fdf46dc4 100644 --- a/emulators/suse_libc5/Makefile +++ b/emulators/suse_libc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/04/04 09:47:01 tron Exp $ +# $NetBSD: Makefile,v 1.19 2003/03/26 04:05:47 jschauma Exp $ DISTNAME= shlibs5 PKGNAME= suse_libc5-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_libjpeg/Makefile b/emulators/suse_libjpeg/Makefile index d063f4e5f7f..1592e8fd1e4 100644 --- a/emulators/suse_libjpeg/Makefile +++ b/emulators/suse_libjpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/11/25 11:01:15 schmonz Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/26 04:05:47 jschauma Exp $ DISTNAME= libjpeg PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_libpng/Makefile b/emulators/suse_libpng/Makefile index 4ea79fbd2ae..b9548410512 100644 --- a/emulators/suse_libpng/Makefile +++ b/emulators/suse_libpng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/11/25 11:01:15 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/26 04:05:47 jschauma Exp $ DISTNAME= libpng PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index d9164db447b..5e86244bee5 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.application,v 1.5 2002/11/25 11:01:16 schmonz Exp $ +# $NetBSD: Makefile.application,v 1.6 2003/03/26 04:05:47 jschauma Exp $ .include "../../mk/bsd.prefs.mk" @@ -14,9 +14,7 @@ SUSE_VERSION= 7.3 .endif .if defined(RPMFILES) -.include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common" -.else -.include "../../mk/bsd.pkg.mk" +. include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common" .endif .else @@ -25,5 +23,4 @@ SUSE_VERSION= 7.3 # This speeds up the marking of all compat_linux packages # as not available. SUSE_DIR_PREFIX= suse -.include "../../mk/bsd.pkg.mk" .endif diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common index 881047216fc..3672f92e22f 100644 --- a/emulators/suse_linux/Makefile.common +++ b/emulators/suse_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2002/12/09 15:17:09 tron Exp $ +# $NetBSD: Makefile.common,v 1.15 2003/03/26 04:05:47 jschauma Exp $ SUSE_VERSION= 7.3 @@ -56,5 +56,3 @@ do-install: show-shlib-type: @${ECHO} linux-${MACHINE_ARCH} - -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_openmotif/Makefile b/emulators/suse_openmotif/Makefile index 60a01dcd347..b5b93eeb4a4 100644 --- a/emulators/suse_openmotif/Makefile +++ b/emulators/suse_openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/11/25 11:01:16 schmonz Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:46 jschauma Exp $ DISTNAME= openmotif PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_slang/Makefile b/emulators/suse_slang/Makefile index cb168ecee23..b87011f72cf 100644 --- a/emulators/suse_slang/Makefile +++ b/emulators/suse_slang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/11/25 11:01:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2003/03/26 04:05:46 jschauma Exp $ DISTNAME= slang PKGNAME= suse_slang-${SUSE_VERSION} @@ -22,3 +22,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile index 615324623af..6251e8c5e05 100644 --- a/emulators/suse_vmware/Makefile +++ b/emulators/suse_vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/04 09:47:08 tron Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:46 jschauma Exp $ DISTNAME= fileutils-4.1-154.i386 PKGNAME= suse_vmware-${SUSE_VERSION} @@ -36,3 +36,4 @@ post-install: >>${PLIST_SRC} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile index f97833cf191..7a525b7db12 100644 --- a/emulators/suse_x11/Makefile +++ b/emulators/suse_x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/11/25 11:01:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.22 2003/03/26 04:05:46 jschauma Exp $ DISTNAME= suse_x11-${SUSE_VERSION} PKGREVISION= 2 @@ -46,3 +46,4 @@ post-install: done .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/suse_xforms/Makefile b/emulators/suse_xforms/Makefile index 846bdbaffa9..cd340e4ee34 100644 --- a/emulators/suse_xforms/Makefile +++ b/emulators/suse_xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/11/25 11:01:18 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2003/03/26 04:05:46 jschauma Exp $ DISTNAME= xforms PKGNAME= suse_${DISTNAME}-${SUSE_VERSION} @@ -21,3 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= ${DISTNAME}${EXTRACT_SUFX} .include "../suse_linux/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile index ddeee2c4644..5e9e1ec5366 100644 --- a/emulators/vmware/Makefile +++ b/emulators/vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/02/16 19:49:16 bad Exp $ +# $NetBSD: Makefile,v 1.5 2003/03/26 04:05:45 jschauma Exp $ DISTNAME= VMware-2.0.4-1142 PKGNAME= vmware-2.0.4 @@ -81,3 +81,4 @@ post-install: ) > ${VMWARE_CFG_DIR}/config .include "../suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 20918c410aa..d3b7b549e28 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/02/16 19:54:56 bad Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:45 jschauma Exp $ DISTNAME= VMware-workstation-3.2.0-2230 PKGNAME= vmware-3.2.0 @@ -96,3 +96,4 @@ post-install: ) > ${VMWARE_CFG_DIR}/config .include "../suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/games/adom/Makefile b/games/adom/Makefile index ce7cd15a57b..8df4f622a99 100644 --- a/games/adom/Makefile +++ b/games/adom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/16 21:26:21 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:45 jschauma Exp $ # DISTNAME= adom-100-elf @@ -30,3 +30,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile index b126fc6c850..9876e023170 100644 --- a/games/civctp-demo/Makefile +++ b/games/civctp-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/04 12:29:47 tron Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:45 jschauma Exp $ DISTNAME= civctp-demo-10251999 PKGNAME= civctp-demo-19991025 @@ -53,3 +53,4 @@ do-install: cd ${WRKSRC} ; ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile index 096a3108bf9..ba3153c0627 100644 --- a/games/eus-demo/Makefile +++ b/games/eus-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/04 12:29:47 tron Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:45 jschauma Exp $ DISTNAME= eus-demo PKGNAME= eus-demo-1.0 @@ -53,3 +53,4 @@ do-install: cd ${WRKSRC} ; ${PAX} -rw [Eai-p]* sounds ${LIBDIR} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile index 9b30c477dc2..14a0dbe6f60 100644 --- a/games/quake3arena-demo/Makefile +++ b/games/quake3arena-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/04/04 12:29:47 tron Exp $ +# $NetBSD: Makefile,v 1.11 2003/03/26 04:05:44 jschauma Exp $ DISTNAME= linuxq3ademo-1_11-6_x86_gz PKGNAME= quake3arena-demo-1.11.6 @@ -56,4 +56,4 @@ do-install: ${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help .include "../../emulators/suse_linux/Makefile.application" - +.include "../../mk/bsd.pkg.mk" diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index 106cbc14825..a9840f9aea2 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/04/04 12:29:48 tron Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/26 04:05:44 jschauma Exp $ DISTNAME= linuxq3apoint-1.17.x86 PKGNAME= quake3arena-1.17 @@ -62,4 +62,4 @@ do-install: ${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help .include "../../emulators/suse_linux/Makefile.application" - +.include "../../mk/bsd.pkg.mk" diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index ca74a763d48..73b226d7613 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/04/04 12:29:48 tron Exp $ +# $NetBSD: Makefile,v 1.20 2003/03/26 04:05:44 jschauma Exp $ DISTNAME= Rollemup PKGNAME= rollemup-1.0 @@ -68,3 +68,4 @@ do-install: @${CHMOD} 664 ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index d8e1f6ee55f..3d7036bf795 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/12/16 14:10:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.17 2003/03/26 04:05:44 jschauma Exp $ PKGNAME= blender-2.11 PKGREVISION= 5 @@ -64,3 +64,4 @@ do-install: ${LN} -sf ../lib/blender/blender ${PREFIX}/bin/blender .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/divxplayer/Makefile b/graphics/divxplayer/Makefile index 539b94fde15..7db20a2a3b8 100644 --- a/graphics/divxplayer/Makefile +++ b/graphics/divxplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/01/26 00:11:33 fredb Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:44 jschauma Exp $ DISTNAME= divx-player-installer PKGNAME= divxplayer-0.2.0 @@ -37,3 +37,4 @@ do-install: ${PREFIX}/bin/${BINARY:S/.bin$//} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile index 6b74792cc6b..5b073590bed 100644 --- a/graphics/mtv/Makefile +++ b/graphics/mtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/04/04 12:29:48 tron Exp $ +# $NetBSD: Makefile,v 1.33 2003/03/26 04:05:43 jschauma Exp $ DISTNAME= mtv-1.2.5 CATEGORIES= graphics @@ -36,3 +36,4 @@ post-install: ${CHMOD} +x ${PREFIX}/emul/linux/usr/doc/mtv .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile index 148bc670ec9..ea3045d09f7 100644 --- a/graphics/ns-flash/Makefile +++ b/graphics/ns-flash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/09/23 10:50:21 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2003/03/26 04:05:43 jschauma Exp $ DISTNAME= flash_${DISTUNAME} CATEGORIES= graphics www @@ -57,3 +57,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR} .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index e3a8cc969e5..a5090c4c02a 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2003/03/17 21:25:38 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.14 2003/03/26 04:05:43 jschauma Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang @@ -71,10 +71,10 @@ do-install: cd ${WRKSRC} && ${PAX} -rwp ma . ${PREFIX} .endif -.if ${OPSYS} != "NetBSD" -. include "../../mk/bsd.pkg.mk" -.else +.if ${OPSYS} == "NetBSD" . include "../../emulators/suse_linux/Makefile.application" .endif +.include "../../mk/bsd.pkg.mk" + PREFIX= ${JVM_HOME} diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index 1edcf3ac61c..ef4ddc5136a 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2003/03/17 18:29:58 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.10 2003/03/26 04:05:42 jschauma Exp $ CATEGORIES= lang EXTRACT_SUFX= .bin @@ -45,8 +45,8 @@ do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX} cd ${WRKSRC} && ${PAX} -rwp ma . ${PREFIX} -.if ${OPSYS} != "NetBSD" -. include "../../mk/bsd.pkg.mk" -.else +.if ${OPSYS} == "NetBSD" . include "../../emulators/suse_linux/Makefile.application" .endif + +.include "../../mk/bsd.pkg.mk" diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile index 7af8c0a80fa..42d03f988dc 100644 --- a/misc/openoffice-linux/Makefile +++ b/misc/openoffice-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/02/27 23:26:11 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:42 jschauma Exp $ DISTNAME= OOo_1.0.2_LinuxIntel_install PKGNAME= openoffice-linux-1.0.2 @@ -72,6 +72,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/misc/staroffice/Makefile b/misc/staroffice/Makefile index 9a2c8b754c6..bad9f2308f9 100644 --- a/misc/staroffice/Makefile +++ b/misc/staroffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/07/03 16:32:49 agc Exp $ +# $NetBSD: Makefile,v 1.26 2003/03/26 04:05:42 jschauma Exp $ DISTNAME= so51a_lnx_${LANGNO} PKGNAME= staroffice-${LANGUAGE}-5.1a @@ -146,3 +146,4 @@ post-install: .endfor .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 978da2b8ca7..e46cfdfadae 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/03/14 10:15:55 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2003/03/26 04:05:42 jschauma Exp $ # # A default so lintpkgsrc is happy @@ -81,7 +81,7 @@ do-install: ${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh .if (${MACHINE_ARCH} == "i386") -.include "../../emulators/suse_linux/Makefile.application" -.else -.include "../../mk/bsd.pkg.mk" +. include "../../emulators/suse_linux/Makefile.application" .endif + +.include "../../mk/bsd.pkg.mk" diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile index 89adc997b82..a2a028eaf9e 100644 --- a/net/edonkey2k/Makefile +++ b/net/edonkey2k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/06/28 11:30:51 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2003/03/26 04:05:42 jschauma Exp $ # DISTNAME= donkey @@ -30,3 +30,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/print/acroread/Makefile b/print/acroread/Makefile index 0d6518fa7b5..53887e63010 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/01/04 12:52:20 cjep Exp $ +# $NetBSD: Makefile,v 1.35 2003/03/26 04:05:41 jschauma Exp $ DISTNAME= acroread # Overridden below PKGNAME= acroread-4.05 @@ -92,3 +92,4 @@ post-install: .endif .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile index 093e65bd08f..75fdc6b27cd 100644 --- a/print/acroread3/Makefile +++ b/print/acroread3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/12/07 02:39:02 schmonz Exp $ +# $NetBSD: Makefile,v 1.21 2003/03/26 04:05:41 jschauma Exp $ PKGNAME= acroread3-3.01 CATEGORIES= print @@ -79,4 +79,4 @@ post-install: @${ECHO_MSG} "${PREFIX}/Acrobat3/Reader/License.pdf" .include "../../emulators/suse_linux/Makefile.application" - +.include "../../mk/bsd.pkg.mk" diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile index bc14a6f5483..7fdaa39c7d9 100644 --- a/print/acroread5/Makefile +++ b/print/acroread5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/01/04 12:58:24 cjep Exp $ +# $NetBSD: Makefile,v 1.6 2003/03/26 04:05:41 jschauma Exp $ DISTNAME= acroread5 # Overridden below PKGNAME= acroread5-5.06 @@ -75,3 +75,4 @@ post-install: @${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt" .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile index 571a46bda82..7243977a8df 100644 --- a/security/uvscan/Makefile +++ b/security/uvscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2003/03/26 04:05:41 jschauma Exp $ DISTNAME= vlnx416e PKGNAME= uvscan-4.16.0 @@ -76,3 +76,4 @@ do-install: done .include "../../emulators/suse_linux/Makefile.application" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile index a5a1b88acce..35a4fc4189f 100644 --- a/sysutils/storage-manager/Makefile +++ b/sysutils/storage-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/07/03 12:07:53 agc Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:40 jschauma Exp $ DISTNAME= sm_linux_v314_install PKGNAME= storage-manager-3.14 @@ -86,4 +86,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${PREFIX}/etc/rc.d/dptelog .include "../../emulators/suse_linux/Makefile.application" - +.include "../../mk/bsd.pkg.mk" 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" |