ports/63059: linux-flashplugin LATEST_LINK and RESTRICTED fixes

Brandon D. Valentine ports at brandon.dvalentine.com
Thu Feb 19 10:00:21 UTC 2004 

>Number:         63059
>Category:       ports
>Synopsis:       linux-flashplugin LATEST_LINK and RESTRICTED fixes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 19 02:00:20 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Brandon D. Valentine
>Release:        FreeBSD 5.2.1-RC2 i386
>Organization:
N/A
>Environment:
System: FreeBSD dallben.prydain.us 5.2.1-RC2 FreeBSD 5.2.1-RC2 #0: Wed Feb 11 18:49:59 CST 2004 root at dallben.prydain.us:/usr/obj/usr/src/sys/DALLBEN i386

>Description:

  Maintainer Updates:

  linux-flashplugin:

  1) Change MAINTAINER from ports at FreeBSD.org to
  ports at brandon.dvalentine.com.  I am volunteering to take over
  maintainership.
  2) Makefile and pkg-plist cleanup.  Switch to using PORTDOCS and
  DOCSDIR.
  3) Set NO_PACKAGE and RESTRICTED.  Macromedia license forbirds
  redistribution.
  4) Set LATEST_LINK to avoid collision with linux-flashplugin6.

  linux-flashplugin6:

  1) Update MAINTAINER email address.
  2) Set LATEST_LINK to avoid collision with linux-flashplugin.
  3) Makefile and pkg-plist cleanup.  Switch to using PORTDOCS and
  DOCSDIR.
  4) Set NO_PACKAGE and RESTRICTED.  Macromedia license forbirds
  redistribution.

  This patch also updates ports/LEGAL to document the license
  restrictions.   The Macromedia license can be found here:
  http://www.macromedia.com/shockwave/download/license/desktop/

  The crucial clause is 3a which states:

  "You may not make or distribute copies of the Software, or
  electronically transfer the Software from one computer to another or
  over a network."

  I have marked this PR serious because I believe it is important to get
  the license issue corrected as soon as possible.

>How-To-Repeat:
	N/A
>Fix:

--- linux-flashplugin_20040219.patch begins here ---
Index: linux-flashplugin/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- linux-flashplugin/Makefile	4 May 2003 17:47:45 -0000	1.17
+++ linux-flashplugin/Makefile	19 Feb 2004 09:45:17 -0000
@@ -7,38 +7,45 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	5.0r51
-CATEGORIES=	www graphics linux
+PORTREVISION=	1
+CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	flash_linux
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	ports at brandon.dvalentine.com
 COMMENT=	The official Macromedia Flash Player for Linux Netscape and Opera
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-NO_CDROM=	"Redistribution not allowed"
+
+NO_PACKAGE=	"Redistribution not allowed"
+RESTRICTED=	"Redistribution not allowed"
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/flash_linux
+LATEST_LINK=	flash5
 
 PLUGINSDIR=	lib/netscape-linux/plugins
-LIBFILES=	libflashplayer.so \
-		ShockwaveFlash.class
+LIBFILES=	libflashplayer.so ShockwaveFlash.class
+
+DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
 
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/flash
-	@${MKDIR} ${PREFIX}/share/doc/flash
-	@${MKDIR} ${PREFIX}/${PLUGINSDIR}
 .for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/flash/
-	@${LN} -sf ${PREFIX}/lib/flash/${f} ${PREFIX}/${PLUGINSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/flash
+.if exists(${PLUGINSDIR})
+	@${LN} -sf ${PREFIX}/lib/flash/${f} ${PREFIX}/${PLUGINSDIR}
+.endif
 .endfor
 .if !defined(NOPORTDOCS)
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/flash/
-	@${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${PREFIX}/share/doc/flash/
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: linux-flashplugin/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- linux-flashplugin/pkg-plist	21 Jul 2001 14:27:22 -0000	1.4
+++ linux-flashplugin/pkg-plist	19 Feb 2004 09:45:17 -0000
@@ -1,9 +1,7 @@
 lib/flash/ShockwaveFlash.class
 lib/flash/libflashplayer.so
-%%PLUGINSDIR%%/ShockwaveFlash.class
-%%PLUGINSDIR%%/libflashplayer.so
-%%PORTDOCS%%share/doc/flash/README
-%%PORTDOCS%%share/doc/flash/ReadMe.htm
- at dirrm share/doc/flash
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ReadMe.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at unexec rm -f %D/%%PLUGINSDIR%%/ShockwaveFlash.class %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/flash
- at unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
Index: linux-flashplugin6/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin6/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- linux-flashplugin6/Makefile	19 Jun 2003 02:18:51 -0000	1.2
+++ linux-flashplugin6/Makefile	19 Feb 2004 09:45:17 -0000
@@ -1,43 +1,51 @@
 # New ports collection makefile for:	linux-flashplugin6
 # Date created:				23 February 2003
-# Whom:				Brandon D. Valentine <ports at geekpunk.net>
+# Whom:				Brandon D. Valentine <ports at brandon.dvalentine.com>
 #
 # $FreeBSD: ports/www/linux-flashplugin6/Makefile,v 1.2 2003/06/19 02:18:51 nork Exp $
 #
 
 PORTNAME=	flashplugin
 PORTVERSION=	6.0r79
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	install_flash_player_6_linux
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports at geekpunk.net
+MAINTAINER=	ports at brandon.dvalentine.com
 COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-NO_CDROM=	"Redistribution not allowed"
+
+NO_PACKAGE=	"Redistribution not allowed"
+RESTRICTED=	"Redistribution not allowed"
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/install_flash_player_6_linux
+LATEST_LINK=	flash6
 
 PLUGINSDIR=	lib/linux-mozilla/plugins
 LIBFILES=	libflashplayer.so flashplayer.xpt
 
+DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
+
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/linux-flashplugin6
-	@${MKDIR} ${PREFIX}/share/doc/linux-flashplugin6
-	@${MKDIR} ${PREFIX}/${PLUGINSDIR}
 .for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin6/
-	@${LN} -sf ${PREFIX}/lib/linux-flashplugin6/${f} ${PREFIX}/${PLUGINSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin6
+.if exists(${PLUGINSDIR})
+	@${LN} -sf ${PREFIX}/lib/linux-flashplugin6/${f} ${PREFIX}/${PLUGINSDIR}
+.endif
 .endfor
 .if !defined(NOPORTDOCS)
-	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/linux-flashplugin6/
-	@${INSTALL_DATA} ${WRKSRC}/readme.htm ${PREFIX}/share/doc/linux-flashplugin6/
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/readme.htm ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: linux-flashplugin6/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin6/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- linux-flashplugin6/pkg-plist	19 Jun 2003 02:18:51 -0000	1.2
+++ linux-flashplugin6/pkg-plist	19 Feb 2004 09:45:17 -0000
@@ -1,9 +1,7 @@
 lib/linux-flashplugin6/flashplayer.xpt
 lib/linux-flashplugin6/libflashplayer.so
-%%PLUGINSDIR%%/flashplayer.xpt
-%%PLUGINSDIR%%/libflashplayer.so
-%%PORTDOCS%%share/doc/linux-flashplugin6/readme.txt
-%%PORTDOCS%%share/doc/linux-flashplugin6/readme.htm
- at dirrm share/doc/linux-flashplugin6
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at unexec rm -f %D/%%PLUGINSDIR%%/flashplayer.xpt %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/linux-flashplugin6
- at unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
Index: ports/LEGAL
===================================================================
RCS file: /home/ncvs/ports/LEGAL,v
retrieving revision 1.332
diff -u -r1.332 LEGAL
--- ports/LEGAL	18 Feb 2004 02:25:45 -0000	1.332
+++ ports/LEGAL	19 Feb 2004 09:45:18 -0000
@@ -187,8 +187,10 @@
 linux-agsatellite	ports/net/linux-agsatellite	Unsure of licensing issues
 linux_devtools		ports/devel/linux_devtools	GPL binaries
 linux-divx4linux	ports/multimedia/linux-divx4linux	Restrictive copyright
-linux-eagle		ports/cad/linux-eagle		Non-commercial usage only &
-			ports/german/linux-eagle	Sale for profit not permitted
+linux-eagle			ports/cad/linux-eagle		Non-commercial usage only &
+					ports/german/linux-eagle	Sale for profit not permitted
+linux-flashplugin*	ports/www/linux-flashplugin     License forbids redistribution
+					ports/www/linux-flashplugin6
 linux-gtk2		ports/x11-toolkits/linux-gtk2	LGPL binary, no source
 linux-ibm-*		ports/java/linux-ibm-jdk13	Redistribution of repackaged
 							binaries not permitted
--- linux-flashplugin_20040219.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list