Split out installation with RPMs from "plain" installation for clarity

and ease-of-maintenance.

3 files changed, 92 insertions, 88 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 040c35f09e7..85779facde5 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/08/23 18:20:35 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2007/08/23 22:22:07 jlam Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 PKGREVISION=		1
@@ -21,107 +21,25 @@ EMUL_PLATFORMS=		freebsd-i386
 EMUL_PLATFORMS+=	linux-i386
 EMUL_PLATFORMS+=	solaris-sparc
 
-EMUL_MODULES.linux=	x11
-EMUL_REQD=		suse>=7.3
+.include "../../mk/bsd.prefs.mk"
 
 USE_LANGUAGES=		# empty
 BUILD_DIRS=		# empty
-EMUL_PKG_FMT=		plain
 
 OPERA_LANG=		en
 OPERA_VER_DATE=		20070716
 OPERA_PKG_VERSION=	9.22
 OPERA_PKG_VERSION_DIR=	922
 
-.include "../../mk/bsd.prefs.mk"
-
-# This package installs from an RPM directly into "/usr" on a Linux
-# system, which can't be managed by pkgsrc.
-#
-NOT_FOR_PLATFORMS=      Linux-*-*
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-EXTRACT_SUFX=		.rpm
-OPERA_ARCH=		.i386
-OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
-OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
-
-WRKSRC=			${WRKDIR}
-BUILD_DIRS=		# empty
-
-EMUL_PKG_FMT=		rpm
-RPM2PKG_PREFIX=		${PREFIX}
-RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
-RPM2PKG_STAGE=		do-install
-
-SUBST_CLASSES+=		opera-sh
-SUBST_STAGE.opera-sh=	post-build
-SUBST_FILES.opera-sh=	opera.sh
-SUBST_VARS.opera-sh=	CMP EMULDIR MKDIR MV RM SED SH
-
-post-extract:
-	${CP} ${FILESDIR}/opera.sh ${WRKSRC}
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
-	${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1			\
-		${PREFIX}/${PKGMANDIR}/man1
-	${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
-	${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}
-
-.elif ${EMUL_PLATFORM} == "freebsd-i386"
-ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
-EXTRACT_SUFX=		.tar.bz2
-OPERA_ARCH=		.i386.freebsd
-OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
-OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
-
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
-
-OWN_DIRS=		${PREFIX}/share/opera/plugins
-
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-ONLY_FOR_PLATFORM+=	SunOS-*-sparc*
-EXTRACT_SUFX=		.tar.bz2
-SOLARIS_VERSION_REQD=	8
-OPERA_ARCH=		-sol8-sparc
-OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
-OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
-
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
-
-BUILD_DEFS+=		INSTALL_ETC_OPERARC
-INSTALL_ETC_OPERARC?=	no
-OWN_DIRS=		${PREFIX}/lib/opera/plugins
-
-.  if !empty(INSTALL_ETC_OPERARC:M[yY][eE][sS])
-CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc \
-			/etc/opera6rc
-CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc.fixed \
-			/etc/opera6rc.fixed
-.  endif
-.endif
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 PLIST_SUBST+=		OPERA_VER_DATE=${OPERA_VER_DATE:Q}
 PLIST_SUBST+=		OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//}
 
-.if ${EMUL_PKG_FMT} == "plain"
-SUBST_CLASSES+=		opera
-SUBST_STAGE.opera=	post-build
-SUBST_FILES.opera=	man/opera.1
-SUBST_SED.opera=	-e 's,/usr/,${PREFIX}/,g'
-
-do-install:
-	@(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
-	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |			\
-		./install.sh --prefix=${PREFIX:Q}
-	@${ECHO} "=> You can ignore any previous lines about opera6rc"
-	@${ECHO}
-
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1
+.if ${EMUL_PLATFORM} == "linux-i386"
+.  include "Makefile.rpm"
+.else
+.  include "Makefile.plain"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/Makefile.plain b/www/opera/Makefile.plain
new file mode 100644
index 00000000000..79ba97bc4ab
--- /dev/null
+++ b/www/opera/Makefile.plain
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile.plain,v 1.1 2007/08/23 22:22:07 jlam Exp $
+
+.if ${EMUL_PLATFORM} == "freebsd-i386"
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+EXTRACT_SUFX=		.tar.bz2
+OPERA_ARCH=		.i386.freebsd
+OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
+OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
+
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+
+OWN_DIRS=		${PREFIX}/share/opera/plugins
+
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+ONLY_FOR_PLATFORM+=	SunOS-*-sparc*
+EXTRACT_SUFX=		.tar.bz2
+SOLARIS_VERSION_REQD=	8
+OPERA_ARCH=		-sol8-sparc
+OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
+OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
+
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+
+BUILD_DEFS+=		INSTALL_ETC_OPERARC
+INSTALL_ETC_OPERARC?=	no
+OWN_DIRS=		${PREFIX}/lib/opera/plugins
+
+.  if !empty(INSTALL_ETC_OPERARC:M[yY][eE][sS])
+CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc \
+			/etc/opera6rc
+CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc.fixed \
+			/etc/opera6rc.fixed
+.  endif
+.endif
+
+SUBST_CLASSES+=		opera
+SUBST_STAGE.opera=	post-build
+SUBST_FILES.opera=	man/opera.1
+SUBST_SED.opera=	-e 's,/usr/,${PREFIX}/,g'
+
+do-install:
+	@(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
+	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |			\
+		./install.sh --prefix=${PREFIX:Q}
+	@${ECHO} "=> You can ignore any previous lines about opera6rc"
+	@${ECHO}
+
+post-install:
+	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1
diff --git a/www/opera/Makefile.rpm b/www/opera/Makefile.rpm
new file mode 100644
index 00000000000..52d0feabfbb
--- /dev/null
+++ b/www/opera/Makefile.rpm
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile.rpm,v 1.1 2007/08/23 22:22:07 jlam Exp $
+
+# This package installs from an RPM directly into "/usr" on a Linux
+# system, which can't be managed by pkgsrc.
+#
+NOT_FOR_PLATFORMS=      Linux-*-*
+
+EMUL_MODULES.linux=	x11
+EMUL_REQD=		suse>=7.3
+
+EXTRACT_SUFX=		.rpm
+OPERA_ARCH=		.i386
+OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
+OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+
+SUBST_CLASSES+=		opera-sh
+SUBST_STAGE.opera-sh=	post-build
+SUBST_FILES.opera-sh=	opera.sh
+SUBST_VARS.opera-sh=	CMP EMULDIR MKDIR MV RM SED SH
+
+post-extract:
+	${CP} ${FILESDIR}/opera.sh ${WRKSRC}
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1			\
+		${PREFIX}/${PKGMANDIR}/man1
+	${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
+	${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}