svn commit: r333650 - head/www/linux-f10-flashplugin11

[Eitan Adler]

Author: eadler
Date: Wed Nov 13 05:48:24 2013
New Revision: 333650
URL: http://svnweb.freebsd.org/changeset/ports/333650

Log:
  Stagify linux-f10-flashplayer.  This makes all my ports STAGEDIR safe!
  
  Submitted by:	bapt

Modified:
  head/www/linux-f10-flashplugin11/Makefile
  head/www/linux-f10-flashplugin11/pkg-plist

Modified: head/www/linux-f10-flashplugin11/Makefile
==============================================================================
--- head/www/linux-f10-flashplugin11/Makefile	Wed Nov 13 02:47:39 2013	(r333649)
+++ head/www/linux-f10-flashplugin11/Makefile	Wed Nov 13 05:48:24 2013	(r333650)
@@ -25,15 +25,16 @@ RESTRICTED_FILES=	${DISTFILES:Nlinux-f10
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USE_NPAPI=	linux-*
-NPAPI_FILES=	libflashplayer.so
+USES=		webplugin:linux
+WEBPLUGIN_NAME=	# empty
+WEBPLUGIN_FILES=	libflashplayer.so
 
 OPTIONS_DEFINE=	GNOME
 GNOME_DESC=	include gnome support for .desktop file
 
 OPTIONS_SUB=	yes
+PLIST_SUB+=RESETPREFIX=${PREFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOME}
@@ -44,12 +45,12 @@ INSTALLS_ICONS=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/libflashsupport.so ${LINUXBASE}/usr/lib
-	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${DESKTOPDIR}
-	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${PREFIX}/share/icons)
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
-.include <bsd.port.post.mk>
+do-install:
+	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
+	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
+	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
+	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
+	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)
+
+.include <bsd.port.mk>

Modified: head/www/linux-f10-flashplugin11/pkg-plist
==============================================================================
--- head/www/linux-f10-flashplugin11/pkg-plist	Wed Nov 13 02:47:39 2013	(r333649)
+++ head/www/linux-f10-flashplugin11/pkg-plist	Wed Nov 13 05:48:24 2013	(r333650)
@@ -1,11 +1,11 @@
 bin/flash-player-properties
+%%WEBPLUGIN_DIR%%libflashplayer.so
 share/applications/flash-player-properties.desktop
 share/icons/hicolor/16x16/apps/flash-player-properties.png
 share/icons/hicolor/22x22/apps/flash-player-properties.png
 share/icons/hicolor/24x24/apps/flash-player-properties.png
 share/icons/hicolor/32x32/apps/flash-player-properties.png
 share/icons/hicolor/48x48/apps/flash-player-properties.png
- at dirrmtry lib/npapi
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/22x22/apps
 @dirrmtry share/icons/hicolor/24x24/apps
@@ -18,6 +18,7 @@ share/icons/hicolor/48x48/apps/flash-pla
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+ at dirrmtry %%WEBPLUGIN_DIR%%
 @cwd /compat/linux
 usr/lib/libflashsupport.so
- at cwd
+ at cwd %%RESETPREFIX%%