From owner-svn-ports-head@freebsd.org Tue Aug 2 13:33:40 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83AFDBAC514; Tue, 2 Aug 2016 13:33:40 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 417CE17E2; Tue, 2 Aug 2016 13:33:40 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72DXdtH054429; Tue, 2 Aug 2016 13:33:39 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72DXd84054424; Tue, 2 Aug 2016 13:33:39 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201608021333.u72DXd84054424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 2 Aug 2016 13:33:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419479 - in head/www: linux-c6-flashplugin11 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.22 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: Tue, 02 Aug 2016 13:33:40 -0000 Author: tijl Date: Tue Aug 2 13:33:38 2016 New Revision: 419479 URL: https://svnweb.freebsd.org/changeset/ports/419479 Log: - 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)). Added: head/www/linux-c6-flashplugin11/distinfo - copied unchanged from r419478, head/www/linux-c6-flashplugin11/distinfo.i386 head/www/linux-c6-flashplugin11/pkg-plist - copied, changed from r419478, head/www/linux-c6-flashplugin11/pkg-plist.i386 Deleted: head/www/linux-c6-flashplugin11/distinfo.i386 head/www/linux-c6-flashplugin11/distinfo.x86_64 head/www/linux-c6-flashplugin11/pkg-plist.i386 head/www/linux-c6-flashplugin11/pkg-plist.x86_64 Modified: head/www/linux-c6-flashplugin11/Makefile head/www/linux-f10-flashplugin11/Makefile Modified: head/www/linux-c6-flashplugin11/Makefile ============================================================================== --- head/www/linux-c6-flashplugin11/Makefile Tue Aug 2 13:05:28 2016 (r419478) +++ head/www/linux-c6-flashplugin11/Makefile Tue Aug 2 13:33:38 2016 (r419479) @@ -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 -.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} Copied: head/www/linux-c6-flashplugin11/distinfo (from r419478, head/www/linux-c6-flashplugin11/distinfo.i386) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/linux-c6-flashplugin11/distinfo Tue Aug 2 13:33:38 2016 (r419479, copy of r419478, head/www/linux-c6-flashplugin11/distinfo.i386) @@ -0,0 +1,5 @@ +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 Copied and modified: head/www/linux-c6-flashplugin11/pkg-plist (from r419478, head/www/linux-c6-flashplugin11/pkg-plist.i386) ============================================================================== --- head/www/linux-c6-flashplugin11/pkg-plist.i386 Tue Aug 2 13:05:28 2016 (r419478, copy source) +++ head/www/linux-c6-flashplugin11/pkg-plist Tue Aug 2 13:33:38 2016 (r419479) @@ -9,7 +9,3 @@ share/icons/hicolor/48x48/apps/flash-pla %%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 Modified: head/www/linux-f10-flashplugin11/Makefile ============================================================================== --- head/www/linux-f10-flashplugin11/Makefile Tue Aug 2 13:05:28 2016 (r419478) +++ head/www/linux-f10-flashplugin11/Makefile Tue Aug 2 13:33:38 2016 (r419479) @@ -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"