[SVN-Commit] r911 - in branches/experimental: Mk www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Aug  3 13:19:25 2012
New Revision: 911

Log:
consistently ignore soversion for dlopen'ed system libraries

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Aug  3 13:19:15 2012	(r910)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Aug  3 13:19:25 2012	(r911)
@@ -526,9 +526,6 @@
 
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
 
-ESD_LIB?=	libesd.so.2
-FREETYPE_LIB?=	libfreetype.so.9
-
 GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
@@ -861,17 +858,11 @@
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh
-	@if [ -f ${MOZSRC}/widget/src/gtk2/nsSound.cpp ] ; then \
-		${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
-			${MOZSRC}/widget/src/gtk2/nsSound.cpp ; \
-	fi
-	@if ! [ -f ${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp ] ; then \
-		${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
-			${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp ; \
-	fi
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
 		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
+	@${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/'
 
 # handles mozilla pis scripts.
 gecko-moz-pis-patch:

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Fri Aug  3 13:19:15 2012	(r910)
+++ branches/experimental/www/seamonkey/Makefile	Fri Aug  3 13:19:25 2012	(r911)
@@ -116,14 +116,6 @@
 		${WRKSRC}/suite/app/nsSuiteApp.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/mozilla/modules/libpref/src/init/all.js
-	@${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \
-		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \
-		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
-		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/${MOZILLA}.desktop