From owner-svn-ports-head@FreeBSD.ORG Wed Nov 13 05:48:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1401EE4B; Wed, 13 Nov 2013 05:48:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0310B24E2; Wed, 13 Nov 2013 05:48:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAD5mOoL082070; Wed, 13 Nov 2013 05:48:24 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAD5mOxY082068; Wed, 13 Nov 2013 05:48:24 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201311130548.rAD5mOxY082068@svn.freebsd.org> From: Eitan Adler Date: Wed, 13 Nov 2013 05:48:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333650 - head/www/linux-f10-flashplugin11 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2013 05:48:25 -0000 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 .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 -.include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi" -.include +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 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 -@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 +@dirrmtry %%WEBPLUGIN_DIR%% @cwd /compat/linux usr/lib/libflashsupport.so -@cwd +@cwd %%RESETPREFIX%%