svn commit: r352747 - in head: Mk www www/gtkhtml4

Koop Mast kwm at FreeBSD.org
Thu May 1 14:23:33 UTC 2014 

Author: kwm
Date: Thu May  1 14:23:31 2014
New Revision: 352747
URL: http://svnweb.freebsd.org/changeset/ports/352747
QAT: https://qat.redports.org/buildarchive/r352747/

Log:
  Add gtkhtml 4.8.0.
  
  This is the gtk+ 3.0 version of gtkhtml3.
  
  Obtained from:	GNOME dev repo.

Added:
  head/www/gtkhtml4/
     - copied from r352681, head/www/gtkhtml3/
Modified:
  head/Mk/bsd.gnome.mk
  head/www/Makefile
  head/www/gtkhtml4/Makefile
  head/www/gtkhtml4/distinfo
  head/www/gtkhtml4/pkg-plist

Modified: head/Mk/bsd.gnome.mk
==============================================================================
--- head/Mk/bsd.gnome.mk	Thu May  1 14:00:05 2014	(r352746)
+++ head/Mk/bsd.gnome.mk	Thu May  1 14:23:31 2014	(r352747)
@@ -89,7 +89,7 @@ _USE_GNOME_ALL+= atk atspi cairo desktop
 		pygtksourceview vte
 
 # GNOME 3 components
-_USE_GNOME_ALL+= dconf gtk30 gtksourceview3 libgda5 libgda5-ui pygobject3 \
+_USE_GNOME_ALL+= dconf gtk30 gtkhtml4 gtksourceview3 libgda5 libgda5-ui pygobject3 \
 		vte3
 
 # C++ bindings
@@ -487,6 +487,10 @@ gtkhtml3_LIB_DEPENDS=	libgtkhtml-3.14.so
 gtkhtml3_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
 gtkhtml3_USE_GNOME_IMPL=libglade2
 
+gtkhtml4_LIB_DEPENDS=	libgtkhtml-4.0.so:${PORTSDIR}/www/gtkhtml4
+gtkhtml4_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-4.0.pc
+gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2
+
 gnomespeech_LIB_DEPENDS=libgnomespeech.so:${PORTSDIR}/accessibility/gnome-speech
 gnomespeech_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
 gnomespeech_USE_GNOME_IMPL=libbonobo

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Thu May  1 14:00:05 2014	(r352746)
+++ head/www/Makefile	Thu May  1 14:23:31 2014	(r352747)
@@ -258,6 +258,7 @@
     SUBDIR += gstreamer-plugins-neon
     SUBDIR += gstreamer1-plugins-neon
     SUBDIR += gtkhtml3
+    SUBDIR += gtkhtml4
     SUBDIR += guile-www
     SUBDIR += gurlchecker
     SUBDIR += habari

Modified: head/www/gtkhtml4/Makefile
==============================================================================
--- head/www/gtkhtml3/Makefile	Wed Apr 30 13:26:18 2014	(r352681)
+++ head/www/gtkhtml4/Makefile	Thu May  1 14:23:31 2014	(r352747)
@@ -1,15 +1,14 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.184 2012/08/17 19:06:47 kwm Exp $
+#   $MCom: ports/trunk/www/gtkhtml4/Makefile 19578 2014-04-25 21:50:30Z kwm $
 
-PORTNAME=	gtkhtml3
-PORTVERSION=	3.32.1
-PORTREVISION=	3
+PORTNAME=	gtkhtml
+PORTVERSION=	4.8.0
+PORTERVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
-DIST_SUBDIR=	gnome2
+PKGNAMESUFFIX=	4
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
@@ -21,28 +20,21 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
-USES=		gettext libtool:keepla pathfix pkgconfig gmake tar:bzip2
-USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
-USE_GNOME=	gnomeprefix intlhack gconf2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage xproto
+USE_GNOME=	gnomeprefix intlhack gtk30
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB=	VERSION="3.14"
+PLIST_SUB=	VERSION="4.0"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
 	    	${WRKSRC}/intltool-merge.in
-	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g ; \
-		s|-DGTK_DISABLE_DEPRECATED||g ; \
-		s|-DG_DISABLE_DEPRECATED||g ; \
-	    	s|-DGDK_DISABLE_DEPRECATED||g' \
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|gtkhtml-editor-test[$$]|gtkhtml3-editor-test$$|' \
-	    	${WRKSRC}/components/editor/Makefile.in
-	@${REINPLACE_CMD} -e 's|G_CONST_RETURN||g' \
-		${WRKSRC}/a11y/*.[ch]
 
 .include <bsd.port.mk>

Modified: head/www/gtkhtml4/distinfo
==============================================================================
--- head/www/gtkhtml3/distinfo	Wed Apr 30 13:26:18 2014	(r352681)
+++ head/www/gtkhtml4/distinfo	Thu May  1 14:23:31 2014	(r352747)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtkhtml-3.32.1.tar.bz2) = 78b6da6c1f4f61947f77de505a626a028ee3ecb6ad3c7c06cc4a6273e16d95c6
-SIZE (gnome2/gtkhtml-3.32.1.tar.bz2) = 1196875
+SHA256 (gnome3/gtkhtml-4.8.0.tar.xz) = a660b63bc6b771f6aa8bd846d79664da1ca08f023fcc2e4e4a53dc20224dea9b
+SIZE (gnome3/gtkhtml-4.8.0.tar.xz) = 1049288

Modified: head/www/gtkhtml4/pkg-plist
==============================================================================
--- head/www/gtkhtml3/pkg-plist	Wed Apr 30 13:26:18 2014	(r352681)
+++ head/www/gtkhtml4/pkg-plist	Thu May  1 14:23:31 2014	(r352747)
@@ -1,4 +1,4 @@
-bin/gtkhtml3-editor-test
+bin/gtkhtml-editor-test
 include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-actions.h
 include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-common.h
 include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-widgets.h
@@ -17,8 +17,8 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
 lib/libgtkhtml-%%VERSION%%.la
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.19
-lib/libgtkhtml-%%VERSION%%.so.19.1.1
+lib/libgtkhtml-%%VERSION%%.so.0
+lib/libgtkhtml-%%VERSION%%.so.0.0.0
 lib/libgtkhtml-editor-%%VERSION%%.la
 lib/libgtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-editor-%%VERSION%%.so.0
@@ -69,6 +69,7 @@ share/locale/el/LC_MESSAGES/gtkhtml-%%VE
 share/locale/en at shaw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -120,8 +121,10 @@ share/locale/sr at latin/LC_MESSAGES/gtkhtm
 share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/te/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/tg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ug/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -137,6 +140,8 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+ at dirrmtry share/locale/ug/LC_MESSAGES
+ at dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr at latin/LC_MESSAGES

More information about the svn-ports-all mailing list