[SVN-Commit] r1402 - in trunk: mail/linux-thunderbird www/linux-firefox www/linux-seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Wed Nov 20 17:54:39 UTC 2013 

Author: jbeich
Date: Wed Nov 20 17:54:30 2013
New Revision: 1402

Log:
replace gre hack with fc12 libs

Modified:
   trunk/mail/linux-thunderbird/Makefile
   trunk/mail/linux-thunderbird/distinfo
   trunk/mail/linux-thunderbird/pkg-plist
   trunk/www/linux-firefox/Makefile
   trunk/www/linux-firefox/distinfo
   trunk/www/linux-firefox/pkg-plist
   trunk/www/linux-seamonkey/Makefile.common

Modified: trunk/mail/linux-thunderbird/Makefile
==============================================================================
--- trunk/mail/linux-thunderbird/Makefile	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/mail/linux-thunderbird/Makefile	Wed Nov 20 17:54:30 2013	(r1402)
@@ -11,7 +11,7 @@
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 USE_BZIP2=	yes
-REPLACE_GRE=	yes
+WANT_GTK218=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
 

Modified: trunk/mail/linux-thunderbird/distinfo
==============================================================================
--- trunk/mail/linux-thunderbird/distinfo	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/mail/linux-thunderbird/distinfo	Wed Nov 20 17:54:30 2013	(r1402)
@@ -1,2 +1,6 @@
 SHA256 (thunderbird-24.1.1.tar.bz2) = c8878b867edb407b6fea97f2f6c71e4f2d5ba359a611e7da01b96a3789008342
 SIZE (thunderbird-24.1.1.tar.bz2) = 28967060
+SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
+SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
+SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
+SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708

Modified: trunk/mail/linux-thunderbird/pkg-plist
==============================================================================
--- trunk/mail/linux-thunderbird/pkg-plist	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/mail/linux-thunderbird/pkg-plist	Wed Nov 20 17:54:30 2013	(r1402)
@@ -34,6 +34,10 @@
 lib/%%APP_NAME%%/isp/rss.rdf
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
+%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/libldap60.so
 lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/libmozalloc.so

Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/www/linux-firefox/Makefile	Wed Nov 20 17:54:30 2013	(r1402)
@@ -12,7 +12,7 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 USE_BZIP2=	yes
-REPLACE_GRE=	yes
+WANT_GTK218=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
 

Modified: trunk/www/linux-firefox/distinfo
==============================================================================
--- trunk/www/linux-firefox/distinfo	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/www/linux-firefox/distinfo	Wed Nov 20 17:54:30 2013	(r1402)
@@ -1,2 +1,6 @@
 SHA256 (firefox-25.0.1.tar.bz2) = dd4c84d48ae0c0ddb5b5f0864379232caeaa998e885724f4beb3bf7a1e15b7ab
 SIZE (firefox-25.0.1.tar.bz2) = 29757912
+SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
+SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
+SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
+SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708

Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/www/linux-firefox/pkg-plist	Wed Nov 20 17:54:30 2013	(r1402)
@@ -38,8 +38,10 @@
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-%%REPLACE_GRE%%lib/%%APP_NAME%%/libldap60.so
-%%REPLACE_GRE%%lib/%%APP_NAME%%/libldif60.so
+%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
+%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/libmozalloc.so
 lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
@@ -50,7 +52,6 @@
 lib/%%APP_NAME%%/libnssutil3.so
 lib/%%APP_NAME%%/libplc4.so
 lib/%%APP_NAME%%/libplds4.so
-%%REPLACE_GRE%%lib/%%APP_NAME%%/libprldap60.so
 lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common	Wed Nov 20 06:14:11 2013	(r1401)
+++ trunk/www/linux-seamonkey/Makefile.common	Wed Nov 20 17:54:30 2013	(r1402)
@@ -3,15 +3,22 @@
 
 .if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
     ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
-.undef REPLACE_GRE
+.undef WANT_GTK218
 .endif
 
 CATEGORIES+=	linux
 MASTER_SITES?=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=		linux-
 
-.if defined(REPLACE_GRE)
-EXTRACT_DEPENDS+=${NONEXISTENT}:${.CURDIR}/../../www/linux-seamonkey:extract
+.if defined(WANT_GTK218)
+MASTER_SITES+=	https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/12/Everything/i386/os/Packages/:f12
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		glib2-2.22.2-2.fc12.i686.rpm:f12 \
+		gtk2-2.18.3-19.fc12.i686.rpm:f12
+GTK218_FILES=	lib/libgio-2.0.so.0 \
+		lib/libglib-2.0.so.0 \
+		usr/lib/libgdk-x11-2.0.so.0 \
+		usr/lib/libgtk-x11-2.0.so.0
 .endif
 
 NO_BUILD=	yes
@@ -35,10 +42,10 @@
 .endif
 DESKTOP_SUFFIX?=	(Linux)
 
-.if defined(REPLACE_GRE)
-PLIST_SUB+=     REPLACE_GRE=""
+.if defined(WANT_GTK218)
+PLIST_SUB+=	GTK218=""
 .else
-PLIST_SUB+=     REPLACE_GRE="@comment "
+PLIST_SUB+=	GTK218="@comment "
 .endif
 
 _A=	>> ${TMPPLIST}
@@ -50,28 +57,16 @@
 	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
 	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
 		${WRKSRC}/${APP_SUBDIR}plugins
+. if defined(WANT_GTK218)
+.  for f in ${GTK218_FILES}
+	@${MV} ${WRKDIR}/${f} ${WRKSRC}
+	@${ECHO_CMD} ${f:T} >>${WRKSRC}/dependentlibs.list
+.  endfor
+	@${REINPLACE_CMD} -i '' '/libxul/ { h; d; }; $$G' \
+		${WRKSRC}/dependentlibs.list
+. endif
 .endif
 
-.if defined(REPLACE_GRE)
-# XXX remove after linux_base-c6 and linux-c6-gtk2 become default
-# using seamonkey gre for linux_base-f10 compat
-post-extract:	replace-gre
-replace-gre:	version-compat-check
-	@${ECHO_MSG} "===>   GRE versions are compatible, replacing with" \
-		"$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)"
-	cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey); \
-		${CP} lib* dependentlibs.list ${WRKSRC}
-
-version-compat-check:
-	@${ECHO_MSG} "===>  Checking GRE version is compatible with" \
-		"$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)"
-	@ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \
-	sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey)/platform.ini); \
-	if [ $$ff_gre_version != $$sm_gre_version ]; then \
-	    ${ECHO_MSG} "===>   GRE versions aren't compatible, aborting"; \
-	    exit 1; \
-	fi
-.endif
 
 .if !target(post-patch)
 post-patch:
@@ -125,6 +120,11 @@
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -sd . -type d | \
 		${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
+.if defined(WANT_GTK218)
+. for f in ${GTK218_FILES}
+	${REINPLACE_CMD} -i '' '/${f:T}/s/^/%%GTK218%%/' ${PLIST}
+. endfor
+.endif
 
 snatch-desktop:
 	${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \

More information about the freebsd-gecko mailing list