- Clean up the Makefile a bit.

- Remove redundant GNOME option.
- Remove duplicate distinfo and pkg-plist files.
- Remove /compat and /compat/linux from pkg-plist.  Other Linux ports ignore
  these too, and /compat isn't necessarily a directory (see hier(7)).

6 files changed, 14 insertions, 59 deletions

diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile
index 91b1b39dbf01..33951af73f7d 100644
--- a/www/linux-c6-flashplugin11/Makefile
+++ b/www/linux-c6-flashplugin11/Makefile
@@ -3,11 +3,12 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.632
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
 		LOCAL/nox:suplib
-PKGNAMEPREFIX=	linux-${USE_LINUX}-
-DISTFILES?=	install_flash_player_11_linux.i386.tar.gz:plugin
+PKGNAMEPREFIX?=	linux-c6-
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -15,54 +16,34 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX?=	c6
-USE_LINUX_APPS?=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap
-WANT_GNOME=	yes
-
-DISTINFO_FILE?=	${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST?=		${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
+USE_LINUX_APPS=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-WRKSRC:=		${WRKDIR}/linux-${USE_LINUX}-${DISTNAME}
 
 USES=		webplugin:linux desktop-file-utils cpe
 WEBPLUGIN_FILES=	libflashplayer.so
 
-OPTIONS_DEFINE=	ALSA GNOME
+OPTIONS_DEFINE=	ALSA
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:audio/linux-c6-alsa-lib
+ALSA_USE=	LINUX_APPS=alsalib,alsa-plugins-oss
+ALSA_USE_OFF?=	LINUX_APPS=openssl-compat
 ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
-ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
-
-GNOME_DESC=	include gnome support for .desktop file
-GNOME_USES=	desktop-file-utils
+ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}"
 
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MALSA}
-USE_LINUX_APPS+=alsalib alsa-plugins-oss
-.else
-.if ${USE_LINUX} == "f10"
-USE_LINUX_APPS+=	openssl
-.else
-USE_LINUX_APPS+=	openssl-compat
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-INSTALLS_ICONS=	yes
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKSRC}/usr/share/applications/flash-player-properties.desktop
+	@${REINPLACE_CMD} '/^NotShowIn=KDE/d' \
+		${WRKSRC}/usr/share/applications/flash-player-properties.desktop
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
diff --git a/www/linux-c6-flashplugin11/distinfo.i386 b/www/linux-c6-flashplugin11/distinfo
index cfd395884ee6..cfd395884ee6 100644
--- a/www/linux-c6-flashplugin11/distinfo.i386
+++ b/www/linux-c6-flashplugin11/distinfo
diff --git a/www/linux-c6-flashplugin11/distinfo.x86_64 b/www/linux-c6-flashplugin11/distinfo.x86_64
deleted file mode 100644
index cfd395884ee6..000000000000
--- a/www/linux-c6-flashplugin11/distinfo.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1468629151
-SHA256 (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942
-SIZE (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = 6986419
-SHA256 (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
diff --git a/www/linux-c6-flashplugin11/pkg-plist.i386 b/www/linux-c6-flashplugin11/pkg-plist
index 7ddfcec73079..fee58f020993 100644
--- a/www/linux-c6-flashplugin11/pkg-plist.i386
+++ b/www/linux-c6-flashplugin11/pkg-plist
@@ -9,7 +9,3 @@ share/icons/hicolor/48x48/apps/flash-player-properties.png
 %%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
 %%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
 %%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%
-%%NO_ALSA%%@dir %%COMPATDIR%%
-@dir share/applications
-@dir share
diff --git a/www/linux-c6-flashplugin11/pkg-plist.x86_64 b/www/linux-c6-flashplugin11/pkg-plist.x86_64
deleted file mode 100644
index 7ddfcec73079..000000000000
--- a/www/linux-c6-flashplugin11/pkg-plist.x86_64
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%
-%%NO_ALSA%%@dir %%COMPATDIR%%
-@dir share/applications
-@dir share
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index 58bb4b08f1ef..c5d8cdda18b6 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -1,11 +1,9 @@
 # Created by: Naoki Tsurutani
 # $FreeBSD$
 
-DISTFILES:=	install_flash_player_11_linux.i386.tar.gz:plugin
-USE_LINUX=		f10
-ALSA_RUN_DEPENDS=	linux-${USE_LINUX}-alsa-lib>=1.0.21_5:audio/linux-f10-alsa-lib
-USE_LINUX_APPS=		curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap
-MASTERDIR=		${.CURDIR}/../linux-c6-flashplugin11
-LINUX_RPM_ARCH=		i686
+PKGNAMEPREFIX=	linux-f10-
+USE_LINUX=	f10
+MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin11
+ALSA_USE_OFF=	LINUX_APPS=openssl
 
 .include "${MASTERDIR}/Makefile"