From amir@active.ath.cx  Sun Oct 10 21:20:57 2004
Return-Path: <amir@active.ath.cx>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1B04D16A4CE; Sun, 10 Oct 2004 21:20:57 +0000 (GMT)
Received: from sa11.bezeqint.net (sa11.bezeqint.net [192.115.104.25])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5FDD043D3F; Sun, 10 Oct 2004 21:20:56 +0000 (GMT)
	(envelope-from amir@active.ath.cx)
Received: from localhost (unknown [127.0.0.1])
	by sa11.bezeqint.net (Bezeq International SMTP out Mail Server) with ESMTP id 32A7533BE3;
	Sun, 10 Oct 2004 23:20:31 +0200 (IST)
Received: from sa11.bezeqint.net ([127.0.0.1])
 by localhost (sa11 [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 20905-03; Sun, 10 Oct 2004 23:20:30 +0200 (IST)
Received: from active.ath.cx (unknown [81.218.199.49])
	by sa11.bezeqint.net (Bezeq International SMTP out Mail Server) with ESMTP;
	Sun, 10 Oct 2004 23:20:30 +0200 (IST)
Received: from localhost (localhost.active.ath.cx [127.0.0.1])
	by active.ath.cx (Postfix) with ESMTP id 7012C5D26;
	Sun, 10 Oct 2004 23:20:53 +0200 (IST)
Received: from active.ath.cx ([127.0.0.1])
 by localhost (active.ath.cx [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 00642-04; Sun, 10 Oct 2004 23:20:50 +0200 (IST)
Received: by active.ath.cx (Postfix, from userid 1000)
	id AE11E5D25; Sun, 10 Oct 2004 23:20:49 +0200 (IST)
Message-Id: <20041010212049.AE11E5D25@active.ath.cx>
Date: Sun, 10 Oct 2004 23:20:49 +0200 (IST)
From: Amir Shalem <amir@active.ath.cx>
Reply-To: Amir Shalem <amir@boom.org.il>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nork@FreeBSD.org
Subject: [patch] Linuxpluginwrapper needs after the library version change (libm)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72494
>Category:       ports
>Synopsis:       [patch] Linuxpluginwrapper needs after the library version change (libm)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 10 21:30:15 GMT 2004
>Closed-Date:    Mon Oct 11 17:17:59 GMT 2004
>Last-Modified:  Mon Oct 11 17:17:59 GMT 2004
>Originator:     Amir Shalem
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD active.ath.cx 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sun Oct 10 18:53:39 IST 2004 amir@active.ath.cx:/usr/obj/usr/src/sys/ACTIVE i386

>Description:
	libm in -current, and after beta7 was bumped
	linuxpluginwrapper sample /etc/libmap.conf needs to be updated.
	or else, the mapping wont work, and pluging will fail to work.

	my fix _doesn't_ support pre-beta7 5 branch such as 5.2.1.

>How-To-Repeat:
	try to use the plugings.

>Fix:
	apply this patch to sample libmap.conf file:
--- libmap.conf-FreeBSD5.x.orig	Mon Aug 23 19:26:44 2004
+++ libmap.conf-FreeBSD5.x	Sun Oct 10 23:16:33 2004
@@ -19,7 +19,7 @@
 libdl.so.2			pluginwrapper/flash6.so
 libz.so.1			libz.so.2
 libstdc++-libc6.2-2.so.3	libstdc++.so.4
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libc.so.6			pluginwrapper/flash6.so
 
 # Flash6 with Mozilla/Firebird/Galeon/Epiphany
@@ -28,7 +28,7 @@
 libdl.so.2			pluginwrapper/flash6.so
 libz.so.1			libz.so.2
 libstdc++-libc6.2-2.so.3	libstdc++.so.4
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libc.so.6			pluginwrapper/flash6.so
 
 
@@ -57,13 +57,13 @@
 #       OF java/java3d PORT.
 [/usr/local/jdk1.4.2/jre/lib/i386/libJ3D.so]
 libdl.so.2			pluginwrapper/java3d.so
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libnsl.so.1			pluginwrapper/java3d.so
 libpthread.so.0			pluginwrapper/java3d.so
 libc.so.6			pluginwrapper/java3d.so
 
 [/usr/local/jdk1.4.2/jre/lib/i386/libj3daudio.so]
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libnsl.so.1			pluginwrapper/java3d_snd.so
 libpthread.so.0			pluginwrapper/java3d_snd.so
 libc.so.6			pluginwrapper/java3d_snd.so
@@ -77,7 +77,7 @@
 # NOTE: THIS IS A SAMPLE.  PLEASE SEE ALSO INSTALL MESSAGES
 #       OF java/jai PORT.
 [/usr/local/jdk1.4.2/jre/lib/i386/libmlib_jai/libmlib_jai.so]
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libc.so.6			pluginwrapper/jai.so
 
 
@@ -85,7 +85,7 @@
 # NOTE: THIS IS A SAMPLE.  PLEASE SEE ALSO INSTALL MESSAGES
 #	OF java/jai-imageio PORT.
 [/usr/local/jdk1.4.2/jre/lib/i386/libclib_jiio.so]
-libm.so.6			libm.so.2
+libm.so.6			libm.so.3
 libc.so.6			pluginwrapper/jai.so
 
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Sun Oct 10 22:05:32 GMT 2004 
Responsible-Changed-Why:  

Over to maintainer. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=72494 

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Amir Shalem <amir@boom.org.il>
Cc: amir@active.ath.cx, FreeBSD-gnats-submit@FreeBSD.org,
	nork@FreeBSD.org
Subject: Re: ports/72494: [patch] Linuxpluginwrapper needs after the library
 version change (libm)
Date: Mon, 11 Oct 2004 11:47:14 +0900 (JST)

 On Sun, 10 Oct 2004 23:20:49 +0200 (IST)
 Amir Shalem <amir@active.ath.cx> wrote:
 > >Number:         72494
 > >Category:       ports
 > >Synopsis:       [patch] Linuxpluginwrapper needs after the library version change (libm)
 
 	Thank you for your report.  But I'm asking to commit.
 	Please test following patch.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/linuxpluginwrapper/Makefile,v
 retrieving revision 1.28
 diff -u -r1.28 Makefile
 --- Makefile	30 Aug 2004 15:40:41 -0000	1.28
 +++ Makefile	10 Oct 2004 12:02:14 -0000
 @@ -6,9 +6,9 @@
  #
  
  PORTNAME=	linuxpluginwrapper
 -PORTVERSION=	20040831
 +PORTVERSION=	20041010
  PORTREVISION=	0
 -CATEGORIES=	www linux
 +CATEGORIES=	www linux emulators
  MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
  		${MASTER_SITE_LOCAL}
  MASTER_SITE_SUBDIR=	nork
 @@ -28,6 +28,7 @@
  .endif
  
  ONLY_FOR_ARCHS=	i386
 +MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}"
  
  USE_XLIB=	yes
  USE_REINPLACE=	yes
 @@ -37,8 +38,10 @@
  .endif
  CONFLICTS=	flashpluginwrapper-*
  
 -.if		${OSVERSION} >= 500000
 -LIBMAPCONF=	${WRKSRC}/misc/libmap.conf-FreeBSD5.x
 +.if		${OSVERSION} >= 503001
 +LIBMAPCONF=	${WRKSRC}/misc/libmap.conf-FreeBSD5-stable
 +.elif		${OSVERSION} >= 500000
 +LIBMAPCONF=	${WRKSRC}/misc/libmap.conf-FreeBSD5-current
  .else
  LIBMAPCONF=	${WRKSRC}/misc/libmap.conf-FreeBSD4.x
  .endif
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/www/linuxpluginwrapper/distinfo,v
 retrieving revision 1.12
 diff -u -r1.12 distinfo
 --- distinfo	30 Aug 2004 15:40:41 -0000	1.12
 +++ distinfo	10 Oct 2004 11:48:15 -0000
 @@ -1,2 +1,2 @@
 -MD5 (linuxpluginwrapper-20040831.tar.gz) = 93154f1119ee7853cfc279b64008885a
 -SIZE (linuxpluginwrapper-20040831.tar.gz) = 13139
 +MD5 (linuxpluginwrapper-20041010.tar.gz) = 3ddc99418f83c7e1a3b47e4e9911bb35
 +SIZE (linuxpluginwrapper-20041010.tar.gz) = 13176
 Index: pkg-message
 ===================================================================
 RCS file: /home/ncvs/ports/www/linuxpluginwrapper/pkg-message,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-message
 --- pkg-message	29 Feb 2004 13:52:25 -0000	1.2
 +++ pkg-message	10 Oct 2004 11:47:53 -0000
 @@ -9,6 +9,10 @@
  	to
  libpthread.so.0			pluginwrapper/flash6.so
  
 +** 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.
 +
  ================================================================
  
  
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/www/linuxpluginwrapper/pkg-plist,v
 retrieving revision 1.6
 diff -u -r1.6 pkg-plist
 --- pkg-plist	22 Aug 2004 05:39:42 -0000	1.6
 +++ pkg-plist	10 Oct 2004 11:44:54 -0000
 @@ -4,6 +4,9 @@
  lib/pluginwrapper/java3d.so
  lib/pluginwrapper/java3d_snd.so
  lib/pluginwrapper/pips.so
 +%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
 +%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
 +%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
  @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/nppdf.so
  @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/flashplayer.xpt
  @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/libflashplayer.so
 @@ -13,3 +16,4 @@
  @exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/flashplayer.xpt    %%X11BASE%%/lib/browser_plugins/
  @exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/libflashplayer.so  %%X11BASE%%/lib/browser_plugins/
  @dirrm lib/pluginwrapper
 +@dirrm %%EXAMPLESDIR%%

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: amir@boom.org.il
Cc: amir@active.ath.cx, FreeBSD-gnats-submit@FreeBSD.org,
	nork@FreeBSD.org
Subject: Re: ports/72494: [patch] Linuxpluginwrapper needs after the library
 version change (libm)
Date: Mon, 11 Oct 2004 11:55:43 +0900 (JST)

 On Mon, 11 Oct 2004 11:47:14 +0900 (JST)
 Norikatsu Shigemura <nork@FreeBSD.org> wrote:
 > > >Number:         72494
 > > >Category:       ports
 > > >Synopsis:       [patch] Linuxpluginwrapper needs after the library version change (libm)
 > 	Thank you for your report.  But I'm asking to commit.
 	                                              ~~~~~~ portmgr@
 	Oops, I missed.
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Mon Oct 11 17:17:46 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72494 
>Unformatted:
