- Move from X11BASE to LOCALBASE

- Introduce app-side support for npapi/xpi smart linkfarming
- Remove old linkfarm and announce full automation
- Break all non-Makefile.npapi plugins (temporarily)
- Do not bump portrevision just yet
- Invite venturesome users to portupgrade -f xpi-* and linux-gecko-apps

Wiki:		http://wiki.freebsd.org/NPAPI, http://wiki.freebsd.org/XPI

10 files changed, 46 insertions, 79 deletions

diff --git a/www/linux-firefox-devel/pkg-plist b/www/linux-firefox-devel/pkg-plist
index 15c4a17815cc..1f4233a541a1 100644
--- a/www/linux-firefox-devel/pkg-plist
+++ b/www/linux-firefox-devel/pkg-plist
@@ -185,9 +185,10 @@ lib/%%APP_NAME%%/searchplugins/yahoo.xml
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
 lib/%%APP_NAME%%/xpicleanup
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/chrome/icons/default
 @dirrm lib/%%APP_NAME%%/chrome/icons
 @dirrm lib/%%APP_NAME%%/chrome
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index bcf7348cdf3d..fb1084a3ac49 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -177,9 +177,10 @@ lib/%%APP_NAME%%/searchplugins/yahoo.src
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
 lib/%%APP_NAME%%/xpicleanup
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/chrome/icons/default
 @dirrm lib/%%APP_NAME%%/chrome/icons
 @dirrm lib/%%APP_NAME%%/chrome
diff --git a/www/linux-flock/pkg-plist b/www/linux-flock/pkg-plist
index 09315c651cc8..3fc60797a5bd 100644
--- a/www/linux-flock/pkg-plist
+++ b/www/linux-flock/pkg-plist
@@ -214,9 +214,10 @@ lib/%%APP_NAME%%/searchplugins/yahoo.src
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
 lib/%%APP_NAME%%/xpicleanup
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/chrome/icons/default
 @dirrm lib/%%APP_NAME%%/chrome/icons
 @dirrm lib/%%APP_NAME%%/chrome
diff --git a/www/linux-mozilla/pkg-plist b/www/linux-mozilla/pkg-plist
index d521ee21470c..cde03b9a13a4 100644
--- a/www/linux-mozilla/pkg-plist
+++ b/www/linux-mozilla/pkg-plist
@@ -565,9 +565,10 @@ lib/%%APP_NAME%%/xpicleanup
 lib/%%APP_NAME%%/xpidl
 lib/%%APP_NAME%%/xpt_dump
 lib/%%APP_NAME%%/xpt_link
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/chrome/en-US/locale/en-US/global
 @dirrm lib/%%APP_NAME%%/chrome/en-US/locale/en-US/necko
 @dirrm lib/%%APP_NAME%%/chrome/en-US/locale/en-US/communicator/security
diff --git a/www/linux-seamonkey-devel/pkg-plist b/www/linux-seamonkey-devel/pkg-plist
index fb47d24d4cb4..95f31cce8290 100644
--- a/www/linux-seamonkey-devel/pkg-plist
+++ b/www/linux-seamonkey-devel/pkg-plist
@@ -467,9 +467,10 @@ lib/%%APP_NAME%%/xpicleanup
 lib/%%APP_NAME%%/xpidl
 lib/%%APP_NAME%%/xpt_dump
 lib/%%APP_NAME%%/xpt_link
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/chrome/icons/default
 @dirrm lib/%%APP_NAME%%/chrome/icons
 @dirrm lib/%%APP_NAME%%/chrome
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index fd4e2b688ac3..98b3eeee1bf9 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -21,7 +21,6 @@ NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 APP_NAME=	${PKGBASE}
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 FDIR=		${PREFIX}/lib/${APP_NAME}
 COMMON_DIR=	${.CURDIR}/../../www/linux-seamonkey
@@ -29,22 +28,14 @@ COMMON_DIR=	${.CURDIR}/../../www/linux-seamonkey
 PLIST_SUB+=	APP_NAME=${APP_NAME}
 SUB_LIST+=	APP_NAME=${APP_NAME}
 SUB_FILES=	${APP_NAME}.desktop
-PKGMESSAGE=	${WRKDIR}/pkg-message
 PREFS_FILE=	${WRKSRC}/defaults/pref/browser-prefs.js
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*devel*}
 DESKTOP_SUFFIX?=	(Linux, devel)
 .endif
 DESKTOP_SUFFIX?=	(Linux)
 
-UNAME?=	/usr/bin/uname
-
-.if !defined(OPSYS)
-OPSYS!= ${UNAME} -s
-.endif
-
-.if !defined(ARCH)
-ARCH!=  ${UNAME} -p
-.endif
+_A=	>> ${TMPPLIST}
+_Q=	2>/dev/null || true
 
 .if ${CATEGORIES:Mwww}
 post-patch:
@@ -53,40 +44,32 @@ post-patch:
 .endif
 
 do-install:
-	${INSTALL} -d ${FDIR}
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications
-	${CP} -pR ${WRKSRC}/ ${FDIR}/
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
-.if ${CATEGORIES:Mwww}
-.for file in linkfarm pkg-message
-	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' \
-		${COMMON_DIR}/files/${file}.in > ${WRKDIR}/${file}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${FDIR}/
-.endif
-	${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${APP_NAME}-run
-	${ECHO_CMD} 'cd ${PREFIX} && exec ${FDIR}/${PORTNAME} "$$@"' >> ${WRKDIR}/${APP_NAME}-run
-	${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}-run ${PREFIX}/bin/${APP_NAME}
-
-post-install:
-.if ${CATEGORIES:Mwww}
-	@${SH} ${FDIR}/linkfarm
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${INSTALL} -d ${FDIR} ${PREFIX}/share/applications
+	@${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/
+	@${CP} -pR ${WRKSRC}/ ${FDIR}/
+	@${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${APP_NAME}-run
+	@${ECHO_CMD} 'exec ${FDIR}/${PORTNAME} "$$@"' >> ${WRKDIR}/${APP_NAME}-run
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}-run ${PREFIX}/bin/${APP_NAME}
+	@${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \
+		${FDIR}/plugins/ ${_Q}
+	@${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \
+		${FDIR}/extensions/ ${_Q}
 
 # Maintainer section
-create-plist:
+create-plist: build
 	${ECHO_CMD} bin/%%APP_NAME%% > ${PLIST}
 	${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \
 		${SED} -e "s#^${PORTNAME}#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST}
-.if ${CATEGORIES:Mwww}
-	${ECHO_CMD} lib/%%APP_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm >> ${PLIST}
-	${ECHO_CMD} @unexec ${FIND} %%PREFIX%%/lib/%%APP_NAME%%/plugins \
-		-type l -delete >> ${PLIST}
-.endif
+	${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \
+		%D/lib/%%APP_NAME%%/plugins/ ${_Q}' >> ${PLIST}
+	${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \
+		%D/lib/%%APP_NAME%%/extensions/ ${_Q}' >> ${PLIST}
+	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/plugins/ \
+		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
+	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/extensions/ \
+		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
 	cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \
 		${SED} -e "s#^${PORTNAME}#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
 	${ECHO_CMD} @dirrmtry share/applications >> ${PLIST}
diff --git a/www/linux-seamonkey/files/linkfarm.in b/www/linux-seamonkey/files/linkfarm.in
deleted file mode 100644
index 0acd4ec743a2..000000000000
--- a/www/linux-seamonkey/files/linkfarm.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Run this after installing Firefox, Mozilla or Seamonkey plugins
-cd	%%PREFIX%%/lib/%%APP_NAME%%/plugins
-find -L . -type l -delete
-find	%%X11BASE%%/lib/linux-beonex/plugins \
-	%%X11BASE%%/lib/netscape-linux/plugins \
-	%%X11BASE%%/lib/flash \
-	%%X11BASE%%/lib/linux-mozilla/plugins \
-	%%X11BASE%%/lib/linux-netscape*/plugins \
-	%%X11BASE%%/lib/linux-flashplugin7 \
-	%%LOCALBASE%%/linux-sun-jdk1.4.2/jre/plugin/i386/ns610-gcc32 \
-	%%LOCALBASE%%/linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
-	%%LOCALBASE%%/linux-blackdown-jdk1.4.2/jre/plugin/i386/mozilla \
-	-type f -maxdepth 1 -exec ln -s {} \; 2>/dev/null
-ln -sf	%%X11BASE%%/lib/linux-adobesvg/libNPSVG3.so . 2>/dev/null
-
-exit 0
diff --git a/www/linux-seamonkey/files/pkg-message.in b/www/linux-seamonkey/files/pkg-message.in
deleted file mode 100644
index 0ea72265b353..000000000000
--- a/www/linux-seamonkey/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-** After adding plugins to (Linux) Firefox, Mozilla,
-** Flock or Seamonkey, run
-** %%PREFIX%%/lib/%%APP_NAME%%/linkfarm as root
-** to make them available to %%APP_NAME%%.
diff --git a/www/linux-seamonkey/files/run b/www/linux-seamonkey/files/run
deleted file mode 100644
index 1a2485251c33..000000000000
--- a/www/linux-seamonkey/files/run
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 326d9f20a940..5d15dcbc5d03 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -471,9 +471,10 @@ lib/%%APP_NAME%%/xpicleanup
 lib/%%APP_NAME%%/xpidl
 lib/%%APP_NAME%%/xpt_dump
 lib/%%APP_NAME%%/xpt_link
-lib/%%APP_NAME%%/linkfarm
-@exec %%PREFIX%%/lib/%%APP_NAME%%/linkfarm
-@unexec /usr/bin/find %%PREFIX%%/lib/%%APP_NAME%%/plugins -type l -delete
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
 @dirrm lib/%%APP_NAME%%/res/dtd
 @dirrm lib/%%APP_NAME%%/res/html
 @dirrm lib/%%APP_NAME%%/res/fonts