Date: Wed, 25 Mar 2015 18:20:42 +0000 (UTC) From: Johannes Jost Meixner <xmj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382257 - in head/www: linux-c6-flashplugin11 linux-f10-flashplugin11 Message-ID: <201503251820.t2PIKgP6020755@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: xmj Date: Wed Mar 25 18:20:42 2015 New Revision: 382257 URL: https://svnweb.freebsd.org/changeset/ports/382257 QAT: https://qat.redports.org/buildarchive/r382257/ Log: www/linux-*-flashplugin11: set -c6 port as master port - Make www/linux-c6-flashplugin11 master port - Make www/linux-f10-flashplugin11 slave port - Reduce future maintenance turnaround. Differential Revision: https://reviews.freebsd.org/D2128 Reviewed by: eadler Approved by: koobs (mentor) Deleted: head/www/linux-f10-flashplugin11/distinfo head/www/linux-f10-flashplugin11/pkg-descr head/www/linux-f10-flashplugin11/pkg-message head/www/linux-f10-flashplugin11/pkg-plist 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 Wed Mar 25 17:59:42 2015 (r382256) +++ head/www/linux-c6-flashplugin11/Makefile Wed Mar 25 18:20:42 2015 (r382257) @@ -3,6 +3,7 @@ PORTNAME= flashplugin PORTVERSION= 11.2r202.451 +PORTREVISION= 1 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib @@ -14,8 +15,8 @@ MAINTAINER= emulation@FreeBSD.org 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 +USE_LINUX?= c6 +USE_LINUX_APPS?= curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap WANT_GNOME= yes RESTRICTED= Redistribution not allowed @@ -31,9 +32,9 @@ OPTIONS_DEFINE= ALSA GNOME OPTIONS_SUB= yes ALSA_DESC= ALSA audio output (broken, needs lemul) -ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib -ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib -ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}" +ALSA_RUN_DEPENDS?= linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib +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 @@ -46,7 +47,11 @@ CPE_PRODUCT= flash_player .if ${PORT_OPTIONS:MALSA} USE_LINUX_APPS+=alsalib alsa-plugins-oss .else -USE_LINUX_APPS+=openssl-compat +.if ${USE_LINUX} == "f10" +USE_LINUX_APPS+= openssl +.else +USE_LINUX_APPS+= openssl-compat +.endif .endif .if ${PORT_OPTIONS:MGNOME} Modified: head/www/linux-f10-flashplugin11/Makefile ============================================================================== --- head/www/linux-f10-flashplugin11/Makefile Wed Mar 25 17:59:42 2015 (r382256) +++ head/www/linux-f10-flashplugin11/Makefile Wed Mar 25 18:20:42 2015 (r382257) @@ -1,68 +1,9 @@ # Created by: Naoki Tsurutani # $FreeBSD$ -PORTNAME= flashplugin -PORTVERSION= 11.2r202.451 -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 -DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} +USE_LINUX= f10 +ALSA_RUN_DEPENDS= linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib +USE_LINUX_APPS= curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap +MASTERDIR= ${.CURDIR}/../linux-c6-flashplugin11 -MAINTAINER= emulation@FreeBSD.org -COMMENT= Adobe Flash Player NPAPI Plugin - -ONLY_FOR_ARCHS= amd64 i386 -USE_LINUX= f10 -USE_LINUX_APPS= curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl -WANT_GNOME= yes - -RESTRICTED= Redistribution not allowed -RESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//} - -NO_BUILD= yes -NO_WRKSUBDIR= yes - -USES= webplugin:linux desktop-file-utils cpe -WEBPLUGIN_FILES= libflashplayer.so - -OPTIONS_DEFINE= ALSA GNOME -OPTIONS_SUB= yes - -ALSA_DESC= ALSA audio output (broken, needs lemul) -ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib -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 - -CPE_VENDOR= adobe -CPE_PRODUCT= flash_player - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MALSA} -USE_LINUX_APPS+=alsalib alsa-plugins-oss -.endif - -.if ${PORT_OPTIONS:MGNOME} -INSTALLS_ICONS= yes -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop - -do-install: - ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} - ${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR} -.if ! ${PORT_OPTIONS:MALSA} - ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib - ${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib -.endif - ${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> +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503251820.t2PIKgP6020755>