[Midnightbsd-cvs] CVS Commit: www/linuxpluginwrapper: Some fake fixes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Some fake fixes.  real player is in /usr/local

The libmap.conf might not be right just yet.  Anyone using this should verify library versions.

Modified Files:
--------------
    mports/www/linuxpluginwrapper:
        Makefile (r1.2 -> r1.3)
        pkg-message (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/linuxpluginwrapper/pkg-message -Lwww/linuxpluginwrapper/pkg-message -u -r1.1 -r1.2
--- www/linuxpluginwrapper/pkg-message
+++ www/linuxpluginwrapper/pkg-message
@@ -1,34 +1,17 @@
-================================================================
-** PLEASE NOTICE TO USER USING FROM 5.0 TO 5.3-BETA6 **
-libm.so was version-bumped on 5.3-BETA7. Please change libm.so.2
-to libm.so.3.
-
-** PLEASE NOTICE TO USER USING FROM 6.0-BETA3 and LATER **
-shared libraries were version-bumped on 6.0-BETA3. Please overhaul
-your libmap.conf.
-
 ** PLEASE NOTE Macromedia Flash7 SUPPORT IS ALPHA+ VERSION. **
-If you find any problem,  please send me report(s) with debug
-information like 'make -DDEBUG install' or patch(es). :-)
 
-Flash7 support is unstable.  I know well that there are offten
-crash or freeze with flash7.  So don't send me a such report.
-Of course, I always welcome to recieve fixed problems report.
+Flash7 support is unstable.  I know well that there are often
+crashes or freezes with flash7.
 
 Please get and apply a dlsym(3) hook patch.
 	http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff
 This provides _dlsym(3) function to fix dynamic-link
 error "can't find gtk_major_version" ad-hoc-ly.
 
-I don't set default to use flash7.  Please set-up your
+I don't set the default to use flash7.  Please set-up your
 enviroment(ln -s, apply patch to rtld,...).
 
-
 ** PLEASE CONFIRM YOUR /etc/libmap.conf ***
-The configuration file was minor fixed.  So please update your
-/etc/libmap.conf.
-================================================================
-
 
 Setup your /etc/libmap.conf.  Please SEE ALSO following file.
 ==> %%LIBMAPCONF%%
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/linuxpluginwrapper/pkg-plist -Lwww/linuxpluginwrapper/pkg-plist -u -r1.1 -r1.2
--- www/linuxpluginwrapper/pkg-plist
+++ www/linuxpluginwrapper/pkg-plist
@@ -9,9 +9,6 @@
 lib/pluginwrapper/oci8.so
 lib/pluginwrapper/realplayer.so
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD6
-%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
-%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
-%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nppdf.so
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.so
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/linuxpluginwrapper/Makefile -Lwww/linuxpluginwrapper/Makefile -u -r1.2 -r1.3
--- www/linuxpluginwrapper/Makefile
+++ www/linuxpluginwrapper/Makefile
@@ -24,16 +24,16 @@
 
 # I will remove WITH_PLUGINS knob.
 .if		defined(WITH_REALPLAYER)
-RUN_DEPENDS+=	${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
+RUN_DEPENDS+=	${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
 WITH_PLUGINS=	1
 .endif
 .if		defined(WITH_ACROREAD)
-RUN_DEPENDS+=	${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
+RUN_DEPENDS+=	${LOCALBASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
 WITH_PLUGINS=	1
 .endif
 
 ONLY_FOR_ARCHS=	i386
-MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV=	EXAMPLESDIR=${FAKE_DESTDIR}${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 CONFLICTS=	flashpluginwrapper-*
 USE_XLIB=	yes
@@ -52,7 +52,7 @@
 .endif
 
 post-build:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
+	@${SED} -e 's,%%PREFIX%%,${FAKE_DESTDIR}${PREFIX},' \
 		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
 		-e 's,%%X11BASE%%,${X11BASE},' \
 		-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \
@@ -64,20 +64,17 @@
 
 .if		defined(WITH_PLUGINS)
 pre-install:
-	@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
+	@${MKDIR} ${FAKE_DESTDIR}${X11BASE}/lib/browser_linux_plugins
 .if		defined(WITH_ACROREAD)
-	@${LN} -sf ${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so \
-		${X11BASE}/lib/browser_linux_plugins/
+	@${LN} -sf ${FAKE_DESTDIR}${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so \
+		${FAKE_DESTDIR}${X11BASE}/lib/browser_linux_plugins/
 .endif
 .if		defined(WITH_REALPLAYER)
-	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
-		${X11BASE}/lib/browser_linux_plugins/
-	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
-		${X11BASE}/lib/browser_linux_plugins/
+	@${LN} -sf ${FAKE_DESTDIR}${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
+		${FAKE_DESTDIR}${X11BASE}/lib/browser_linux_plugins/
+	@${LN} -sf ${FAKE_DESTDIR}${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
+		${FAKE_DESTDIR}${X11BASE}/lib/browser_linux_plugins/
 .endif
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>