svn commit: r369846 - in head/www: linux-c6-flashplugin11 linux-f10-flashplugin11

[Jung-uk Kim]

Author: jkim
Date: Thu Oct  2 18:39:36 2014
New Revision: 369846
URL: https://svnweb.freebsd.org/changeset/ports/369846
QAT: https://qat.redports.org/buildarchive/r369846/

Log:
  - Re-add PKGNAMEPREFIX for www/linux-f10-flashplugin11. [1]
  - Honor LINUXBASE in pkg-plist.
  - Reduce diff between linux-c6-flashplugin11 and linux-f10-flashplugin11.
  
  Reported by:	nyan [1]

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

Modified: head/www/linux-c6-flashplugin11/Makefile
==============================================================================
--- head/www/linux-c6-flashplugin11/Makefile	Thu Oct  2 18:33:43 2014	(r369845)
+++ head/www/linux-c6-flashplugin11/Makefile	Thu Oct  2 18:39:36 2014	(r369846)
@@ -16,7 +16,7 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	c6
-USE_LINUX_APPS=	openssl-compat curl cyrus-sasl2 nspr nss gtk2 #-alsalib libssh2 openldap
+USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
@@ -31,10 +31,11 @@ WEBPLUGIN_FILES=	libflashplayer.so
 OPTIONS_DEFINE=	GNOME
 GNOME_DESC=	include gnome support for .desktop file
 
-CPE_VENDOR=     adobe
-CPE_PRODUCT=    flash_player
+CPE_VENDOR=	adobe
+CPE_PRODUCT=	flash_player
 
 OPTIONS_SUB=	yes
+PLIST_SUB=	LINUXBASE="${LINUXBASE}"
 
 .include <bsd.port.options.mk>
 

Modified: head/www/linux-c6-flashplugin11/pkg-plist
==============================================================================
--- head/www/linux-c6-flashplugin11/pkg-plist	Thu Oct  2 18:33:43 2014	(r369845)
+++ head/www/linux-c6-flashplugin11/pkg-plist	Thu Oct  2 18:39:36 2014	(r369846)
@@ -6,4 +6,4 @@ share/icons/hicolor/22x22/apps/flash-pla
 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
-/compat/linux/usr/lib/libflashsupport.so
+%%LINUXBASE%%/usr/lib/libflashsupport.so

Modified: head/www/linux-f10-flashplugin11/Makefile
==============================================================================
--- head/www/linux-f10-flashplugin11/Makefile	Thu Oct  2 18:33:43 2014	(r369845)
+++ head/www/linux-f10-flashplugin11/Makefile	Thu Oct  2 18:39:36 2014	(r369846)
@@ -6,17 +6,17 @@ PORTVERSION=	11.2r202.406
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
 		LOCAL/nox:suplib
+PKGNAMEPREFIX=	linux-${USE_LINUX}-
 DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
 		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
 ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	yes
-USE_LINUX_APPS=	openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2
+USE_LINUX=	f10
+USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
@@ -35,6 +35,7 @@ CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 
 OPTIONS_SUB=	yes
+PLIST_SUB=	LINUXBASE="${LINUXBASE}"
 
 .include <bsd.port.options.mk>
 

Modified: head/www/linux-f10-flashplugin11/pkg-plist
==============================================================================
--- head/www/linux-f10-flashplugin11/pkg-plist	Thu Oct  2 18:33:43 2014	(r369845)
+++ head/www/linux-f10-flashplugin11/pkg-plist	Thu Oct  2 18:39:36 2014	(r369846)
@@ -6,4 +6,4 @@ share/icons/hicolor/22x22/apps/flash-pla
 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
-/compat/linux/usr/lib/libflashsupport.so
+%%LINUXBASE%%/usr/lib/libflashsupport.so