linux-flashplugin: -

1) Hand maintainership over to ports@brandon.dvalentine.com
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."

PR:		63059
Submitted by:	Brandon D. Valentine <ports@brandon.dvalentine.com> (maintainer)

8 files changed, 85 insertions, 62 deletions

diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
index 3c56bec156b1..390996527dbe 100644
--- a/www/linux-flashplugin/Makefile
+++ b/www/linux-flashplugin/Makefile
@@ -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@FreeBSD.org
+MAINTAINER=	ports@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>
diff --git a/www/linux-flashplugin/pkg-plist b/www/linux-flashplugin/pkg-plist
index a6597ea5f428..dbf102e90823 100644
--- a/www/linux-flashplugin/pkg-plist
+++ b/www/linux-flashplugin/pkg-plist
@@ -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
-@dirrm share/doc/flash
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ReadMe.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %D/%%PLUGINSDIR%%/ShockwaveFlash.class %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/flash
-@unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
diff --git a/www/linux-flashplugin6/Makefile b/www/linux-flashplugin6/Makefile
index b703c65ab0c7..e0a5485a2bb4 100644
--- a/www/linux-flashplugin6/Makefile
+++ b/www/linux-flashplugin6/Makefile
@@ -1,43 +1,51 @@
 # New ports collection makefile for:	linux-flashplugin6
 # Date created:				23 February 2003
-# Whom:				Brandon D. Valentine <ports@geekpunk.net>
+# Whom:				Brandon D. Valentine <ports@brandon.dvalentine.com>
 #
 # $FreeBSD$
 #
 
 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@geekpunk.net
+MAINTAINER=	ports@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>
diff --git a/www/linux-flashplugin6/pkg-plist b/www/linux-flashplugin6/pkg-plist
index bc257a684727..84b7faabe534 100644
--- a/www/linux-flashplugin6/pkg-plist
+++ b/www/linux-flashplugin6/pkg-plist
@@ -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
-@dirrm share/doc/linux-flashplugin6
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %D/%%PLUGINSDIR%%/flashplayer.xpt %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/linux-flashplugin6
-@unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
diff --git a/www/linux-flashplugin7/Makefile b/www/linux-flashplugin7/Makefile
index b703c65ab0c7..e0a5485a2bb4 100644
--- a/www/linux-flashplugin7/Makefile
+++ b/www/linux-flashplugin7/Makefile
@@ -1,43 +1,51 @@
 # New ports collection makefile for:	linux-flashplugin6
 # Date created:				23 February 2003
-# Whom:				Brandon D. Valentine <ports@geekpunk.net>
+# Whom:				Brandon D. Valentine <ports@brandon.dvalentine.com>
 #
 # $FreeBSD$
 #
 
 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@geekpunk.net
+MAINTAINER=	ports@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>
diff --git a/www/linux-flashplugin7/pkg-plist b/www/linux-flashplugin7/pkg-plist
index bc257a684727..84b7faabe534 100644
--- a/www/linux-flashplugin7/pkg-plist
+++ b/www/linux-flashplugin7/pkg-plist
@@ -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
-@dirrm share/doc/linux-flashplugin6
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %D/%%PLUGINSDIR%%/flashplayer.xpt %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/linux-flashplugin6
-@unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile
index b703c65ab0c7..e0a5485a2bb4 100644
--- a/www/linux-flashplugin9/Makefile
+++ b/www/linux-flashplugin9/Makefile
@@ -1,43 +1,51 @@
 # New ports collection makefile for:	linux-flashplugin6
 # Date created:				23 February 2003
-# Whom:				Brandon D. Valentine <ports@geekpunk.net>
+# Whom:				Brandon D. Valentine <ports@brandon.dvalentine.com>
 #
 # $FreeBSD$
 #
 
 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@geekpunk.net
+MAINTAINER=	ports@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>
diff --git a/www/linux-flashplugin9/pkg-plist b/www/linux-flashplugin9/pkg-plist
index bc257a684727..84b7faabe534 100644
--- a/www/linux-flashplugin9/pkg-plist
+++ b/www/linux-flashplugin9/pkg-plist
@@ -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
-@dirrm share/doc/linux-flashplugin6
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %D/%%PLUGINSDIR%%/flashplayer.xpt %D/%%PLUGINSDIR%%/libflashplayer.so
 @dirrm lib/linux-flashplugin6
-@unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true