ports/63545: Today's portupgrade of linux-flashplugin to linux-flashplugin-6.0r79_1 breaks flash for linux-opera on FreeBSD-4.9Stable

[Brandon D. Valentine]

[ Once more, this time _with_ the patch.  It's definitely Monday. ]

Attached is a patch which corrects the problem with my ports.

I am unable to discover the cause of the following, however:

dallben# make USE_X_PREFIX=YES install
===>  Installing for linux-flashplugin-6.0r79_2
===>   linux-flashplugin-6.0r79_2 depends on file: /compat/linux/etc/redhat-release - found
===>   linux-flashplugin-6.0r79_2 depends on shared library: X11.6 - found
===>   Generating temporary packing list
===>  Checking if www/linux-flashplugin6 already installed
===>   Registering installation for linux-flashplugin-6.0r79_2
make: Max recursion level (500) exceeded.: Resource temporarily unavailable
dallben#

Does anyone see anything in my ports which would cause this behavior?
The port installs correctly despite this error message.

Thanks,

Brandon D. Valentine
-- 
brandon at dvalentine.com                           http://www.geekpunk.net
Pseudo-Random Googlism:  snow is always a special event in mecklenburg
                         county

Index: linux-flashplugin/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- linux-flashplugin/Makefile	28 Feb 2004 08:27:02 -0000	1.19
+++ linux-flashplugin/Makefile	1 Mar 2004 21:53:58 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	5.0r51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -23,28 +23,28 @@
 RESTRICTED=	"Redistribution not allowed"
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/flash_linux
 LATEST_LINK=	flash5
 
-PLUGINSDIR=	lib/netscape-linux/plugins
+PLUGINSDIR?=	lib/netscape-linux/plugins
 LIBFILES=	libflashplayer.so ShockwaveFlash.class
+PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
+.include <bsd.port.pre.mk>
 
-PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
+DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/flash
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/flash
-.if exists(${PLUGINSDIR})
-	@${LN} -sf ${PREFIX}/lib/flash/${f} ${PREFIX}/${PLUGINSDIR}
-.endif
-.endfor
+	@for f in ${LIBFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/lib/flash; \
+		if [ -d ${PREFIX}/${PLUGINSDIR} ]; then \
+			${LN} -sf ${PREFIX}/lib/flash/$${f} ${PREFIX}/${PLUGINSDIR}; \
+		fi; \
+	done
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.port.mk>
Index: linux-flashplugin6/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-flashplugin6/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- linux-flashplugin6/Makefile	28 Feb 2004 08:27:02 -0000	1.4
+++ linux-flashplugin6/Makefile	1 Mar 2004 21:53:58 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	6.0r79
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -23,28 +23,28 @@
 RESTRICTED=	"Redistribution not allowed"
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/install_flash_player_6_linux
 LATEST_LINK=	flash6
 
-PLUGINSDIR=	lib/linux-mozilla/plugins
+PLUGINSDIR?=	lib/linux-mozilla/plugins
 LIBFILES=	libflashplayer.so flashplayer.xpt
+PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
+.include <bsd.port.pre.mk>
 
-PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
+DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/linux-flashplugin6
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin6
-.if exists(${PLUGINSDIR})
-	@${LN} -sf ${PREFIX}/lib/linux-flashplugin6/${f} ${PREFIX}/${PLUGINSDIR}
-.endif
-.endfor
+	@for f in ${LIBFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/lib/linux-flashplugin6; \
+		if [ -d ${PREFIX}/${PLUGINSDIR} ]; then \
+			${LN} -sf ${PREFIX}/lib/linux-flashplugin6/$${f} ${PREFIX}/${PLUGINSDIR}; \
+		fi; \
+	done
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/readme.htm ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>