From 2b2fcf737035d25d243573f4cc7b37420e963b78 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 4 Apr 2002 11:56:46 +0000 Subject: Use "suse_linux/Makefile.application" to pick correct SuSE packages. --- www/opera/Makefile | 12 ++++++------ www/opera6/Makefile | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'www') diff --git a/www/opera/Makefile b/www/opera/Makefile index d07251a8d6e..a3eb4db5a0d 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/04/02 20:46:34 jdolecek Exp $ +# $NetBSD: Makefile,v 1.23 2002/04/04 11:56:46 tron Exp $ DISTNAME= opera-5.0.1 CATEGORIES= www @@ -23,10 +23,10 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC .include "../../mk/bsd.prefs.mk" .if (${MACHINE_ARCH} == i386) -DEPENDS+= suse_compat>=6.3:../../emulators/suse_compat -DEPENDS+= suse_libjpeg>=6.4:../../emulators/suse_libjpeg -DEPENDS+= suse_libpng>=6.4:../../emulators/suse_libpng -DEPENDS+= suse_x11>=6.3:../../emulators/suse_x11 +DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_libjpeg>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libjpeg +DEPENDS+= suse_libpng>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libpng +DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 OPERA_ARCH= ${MACHINE_ARCH} .elif (${MACHINE_ARCH} == powerpc) @@ -40,4 +40,4 @@ RPMFILES= opera-static-5.0-1.${OPERA_ARCH}.rpm post-install: ${LN} -fs ../${EMULSUBDIR}/usr/bin/opera ${PREFIX}/bin -.include "../../emulators/suse_linux/Makefile.common" +.include "../../emulators/suse_linux/Makefile.application" diff --git a/www/opera6/Makefile b/www/opera6/Makefile index 00921c8688d..bf5e4c58b50 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/04/01 14:18:37 jdolecek Exp $ +# $NetBSD: Makefile,v 1.6 2002/04/04 11:56:47 tron Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -28,10 +28,10 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC OPERA_PKG_VERSION= 6.0 .if (${MACHINE_ARCH} == i386) -DEPENDS+= suse_compat>=6.3:../../emulators/suse_compat -DEPENDS+= suse_libjpeg>=6.4:../../emulators/suse_libjpeg -DEPENDS+= suse_libpng>=6.4:../../emulators/suse_libpng -DEPENDS+= suse_x11>=6.3:../../emulators/suse_x11 +DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_libjpeg>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libjpeg +DEPENDS+= suse_libpng>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libpng +DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 OPERA_ARCH= i386 OPERA_DIR= 600/beta1 @@ -48,7 +48,7 @@ do-build: post-install: post-install-manpage ${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin -.include "../../emulators/suse_linux/Makefile.common" +.include "../../emulators/suse_linux/Makefile.application" post-install-manpage: # The SuSE common makefile defines "MANCOMPRESSED". -- cgit v1.2.3