Factor out a Makefile.common so this can be used for firefox-gtk2-bin and

firefox-gtk2-bin-nightly as well.

2 files changed, 48 insertions, 43 deletions

diff --git a/www/firefox-bin-flash/Makefile b/www/firefox-bin-flash/Makefile
index 7223b606b1f..7f513fd6748 100644
--- a/www/firefox-bin-flash/Makefile
+++ b/www/firefox-bin-flash/Makefile
@@ -1,50 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/05/04 04:26:43 snj Exp $
+# $NetBSD: Makefile,v 1.3 2004/09/28 22:58:49 rh Exp $
+.include "Makefile.common"
 
-DISTNAME=		install_flash_player_6_${DISTUNAME}
-PKGNAME=		firefox-bin-flash-${FLASH_VERS:S/r/./}
-CATEGORIES=		www graphics
-MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.flash.com/
 COMMENT=		Flash Player plugin for firefox-bin
 
-ONLY_FOR_PLATFORM=      *-*-i386
-
-DIST_SUBDIR=		flash/${FLASH_VERS}
-
-.include "../../mk/bsd.prefs.mk"
-
-SUB=			english/${DISTUNAME}/${FLASH_VERS}
-
-FLASH_VERS=		6.0r79
 DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
-DISTUNAME=		linux
-WRKNAME=		install_flash_player_6_${DISTUNAME}
-
-RESTRICTED=             "Redistribution not permitted"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-USE_BUILDLINK3=		yes
-USE_PKGINSTALL=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS=		no
-CRYPTO=			yes
-
-MOZ_NAME=		firefox-linux
-WRKSRC=			${WRKDIR}/${WRKNAME}
-NS_PLUGINS_DIR=		${PREFIX}/lib/${MOZ_NAME}/plugins
-
-PLIST_SUBST+=		MOZ_NAME="${MOZ_NAME}"
-
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
 .include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
new file mode 100644
index 00000000000..af82a368859
--- /dev/null
+++ b/www/firefox-bin-flash/Makefile.common
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile.common,v 1.1 2004/09/28 22:58:49 rh Exp $
+
+DISTNAME=		install_flash_player_6_${DISTUNAME}
+PKGNAME=		${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
+CATEGORIES=		www graphics
+MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
+
+MAINTAINER?=		tech-pkg@NetBSD.org
+HOMEPAGE?=		http://www.flash.com/
+
+ONLY_FOR_PLATFORM=      *-*-i386
+
+DIST_SUBDIR=		flash/${FLASH_VERS}
+
+.include "../../mk/bsd.prefs.mk"
+
+SUB=			english/${DISTUNAME}/${FLASH_VERS}
+
+FLASH_VERS=		6.0r79
+DISTUNAME=		linux
+WRKNAME=		install_flash_player_6_${DISTUNAME}
+
+RESTRICTED=             "Redistribution not permitted"
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+CRYPTO=			yes
+
+MOZ_NAME?=		firefox-linux
+MOZ_BIN?=		${MOZ_NAME:S/linux/bin/}
+WRKSRC=			${WRKDIR}/${WRKNAME}
+NS_PLUGINS_DIR=		${PREFIX}/lib/${MOZ_NAME}/plugins
+
+PLIST_SUBST+=		MOZ_NAME="${MOZ_NAME}"
+
+do-install:
+	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}