From owner-svn-ports-all@FreeBSD.ORG Sun Dec 8 09:55:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F078588A; Sun, 8 Dec 2013 09:55:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D90E21783; Sun, 8 Dec 2013 09:55:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB89thPg002621; Sun, 8 Dec 2013 09:55:43 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB89tfU8002610; Sun, 8 Dec 2013 09:55:41 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312080955.rB89tfU8002610@svn.freebsd.org> From: Koop Mast Date: Sun, 8 Dec 2013 09:55:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335873 - in head: . Mk x11-toolkits x11-toolkits/gnome-pty-helper x11-toolkits/gnome-pty-helper/files x11-toolkits/vte x11-toolkits/vte3 x11-toolkits/vte3/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 09:55:44 -0000 Author: kwm Date: Sun Dec 8 09:55:41 2013 New Revision: 335873 URL: http://svnweb.freebsd.org/changeset/ports/335873 Log: Add vte3, the Gtk 3 version of the vte terminal widget. Split off gnome-pty-helper from vte to allow both versions of vte to be installed at the same time. Update comment to make it clearer which gtk+ version it is for. Enable introspection bindings in vte. Obtained from: GNOME dev repo. Added: head/x11-toolkits/gnome-pty-helper/ - copied from r335860, head/x11-toolkits/vte/ head/x11-toolkits/vte3/ - copied from r335860, head/x11-toolkits/vte/ Deleted: head/x11-toolkits/gnome-pty-helper/distinfo head/x11-toolkits/gnome-pty-helper/files/ head/x11-toolkits/vte3/files/patch-config.h.in head/x11-toolkits/vte3/files/patch-configure head/x11-toolkits/vte3/files/patch-python_Makefile.in head/x11-toolkits/vte3/files/patch-src_pty.c head/x11-toolkits/vte3/files/patch-src_vte.c Modified: head/Mk/bsd.gnome.mk head/UPDATING head/x11-toolkits/Makefile head/x11-toolkits/gnome-pty-helper/Makefile head/x11-toolkits/gnome-pty-helper/pkg-descr head/x11-toolkits/gnome-pty-helper/pkg-plist head/x11-toolkits/vte/Makefile head/x11-toolkits/vte/pkg-plist head/x11-toolkits/vte3/Makefile head/x11-toolkits/vte3/distinfo head/x11-toolkits/vte3/pkg-plist Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Sun Dec 8 09:03:01 2013 (r335872) +++ head/Mk/bsd.gnome.mk Sun Dec 8 09:55:41 2013 (r335873) @@ -89,7 +89,8 @@ _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 gtksourceview3 libgda5 libgda5-ui pygobject3 \ + vte3 # C++ bindings _USE_GNOME_ALL+=atkmm cairomm gconfmm gconfmm26 glibmm gtkmm20 gtkmm24 \ @@ -380,6 +381,10 @@ vte_LIB_DEPENDS= libvte.so:${PORTSDIR}/x vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc vte_USE_GNOME_IMPL= gtk20 +vte3_LIB_DEPENDS= libvte2_90.so:${PORTSDIR}/x11-toolkits/vte3 +vte3_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte-2.90.pc +vte3_USE_GNOME_IMPL= gtk30 + libzvt_LIB_DEPENDS= libzvt-2.0.so:${PORTSDIR}/x11-toolkits/libzvt libzvt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libzvt-2.0.pc libzvt_USE_GNOME_IMPL= gtk20 Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Dec 8 09:03:01 2013 (r335872) +++ head/UPDATING Sun Dec 8 09:55:41 2013 (r335873) @@ -5,6 +5,22 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131208: + AFFECTS: users of x11-toolkits/vte + AUTHOR: kwm@FreeBSD.org + + The gnome-pty-helper program has been split off from the vte package + to allow both vte and vte3 to be installed at the same time. To update + after this change please do the following: + + # pkg_delete -f vte\* + or + # pkg delete -fg vte\* + followed by + # portmaster x11-toolkits/vte + or + # portupgrade x11-toolkits/vte + 20131207: AFFECTS: users of mail/opensmtpd AUTHOR: ashish@FreeBSD.org Modified: head/x11-toolkits/Makefile ============================================================================== --- head/x11-toolkits/Makefile Sun Dec 8 09:03:01 2013 (r335872) +++ head/x11-toolkits/Makefile Sun Dec 8 09:55:41 2013 (r335873) @@ -33,6 +33,7 @@ SUBDIR += girara SUBDIR += gnocl SUBDIR += gnome-desktop-sharp20 + SUBDIR += gnome-pty-helper SUBDIR += gnome-sharp20 SUBDIR += gnomemm SUBDIR += gnustep-back @@ -264,6 +265,7 @@ SUBDIR += vdkbuilder SUBDIR += viewklass SUBDIR += vte + SUBDIR += vte3 SUBDIR += vte-reference SUBDIR += vtkfox SUBDIR += wmapp Modified: head/x11-toolkits/gnome-pty-helper/Makefile ============================================================================== --- head/x11-toolkits/vte/Makefile Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/gnome-pty-helper/Makefile Sun Dec 8 09:55:41 2013 (r335873) @@ -1,52 +1,24 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/gnome-pty-helper/Makefile 18942 2013-12-08 01:31:37Z kwm $ -PORTNAME= vte -PORTVERSION= 0.26.2 -PORTREVISION?= 4 -CATEGORIES= x11-toolkits gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +PORTNAME= gnome-pty-helper +PORTREVISION= 0 +PKGNAMESUFFIX= #empty + +COMMENT= utmp/wtmp/lastlog helper program for the vte Terminal widget + +VTE3_SLAVE= yes + +MASTERDIR= ${.CURDIR}/../../x11-toolkits/vte3 +WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist +USES= pathfix +USE_GNOME= gnomeprefix +CONFIGURE_ARGS= # empty +PATCH_STRIP= -p1 +EXTRA_PATCHES+= ${MASTERDIR}/files/patch-gnome-pty-helper_Makefile.in \ + ${MASTERDIR}/files/patch-gnome-pty-helper_gnome-pty-helper.c -MAINTAINER?= gnome@FreeBSD.org -COMMENT?= Terminal widget with improved accessibility and I18N support - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -USE_GMAKE= yes -USES= bison pathfix gettext pkgconfig -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool -USE_GNOME?= gnomeprefix gtk20 ltverhack referencehack -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS?=--disable-python \ - --disable-Bsymbolic \ - --disable-freetypetest - -.if !defined(MASTERDIR) -OPTIONS_DEFINE= GLX -GLX_DESC= Support for DRI/GLX rendering -.endif - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR) -CONFIGURE_ARGS+= --with-glX -USE_GL= yes -.endif - -.include - -.if ${OSVERSION} < 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c -.endif - -.include - -.endif +.include "${MASTERDIR}/Makefile" Modified: head/x11-toolkits/gnome-pty-helper/pkg-descr ============================================================================== --- head/x11-toolkits/vte/pkg-descr Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/gnome-pty-helper/pkg-descr Sun Dec 8 09:55:41 2013 (r335873) @@ -1,4 +1,2 @@ -Terminal widget with improved font, internationalisation and accessibility -support for the GNOME 2 desktop. Designed to replace libzvt. - -WWW: http://www.gnome.org/ +Gnome-pty-helper is a backend executable that provides access to the utmp +and wtmp files for vte-based terminal applications such as gnome-terminal. Modified: head/x11-toolkits/gnome-pty-helper/pkg-plist ============================================================================== --- head/x11-toolkits/vte/pkg-plist Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/gnome-pty-helper/pkg-plist Sun Dec 8 09:55:41 2013 (r335873) @@ -1,159 +1 @@ -bin/vte -include/vte-0.0/vte/pty.h -include/vte-0.0/vte/reaper.h -include/vte-0.0/vte/vte.h -include/vte-0.0/vte/vteaccess.h -include/vte-0.0/vte/vtedeprecated.h -include/vte-0.0/vte/vtepty.h -include/vte-0.0/vte/vtetypebuiltins.h -include/vte-0.0/vte/vteversion.h -lib/libvte.a -lib/libvte.la -lib/libvte.so -lib/libvte.so.9 -lib/vte-0.0/decset -lib/vte-0.0/interpret -lib/vte-0.0/osc -lib/vte-0.0/slowcat -lib/vte-0.0/window -libdata/pkgconfig/vte.pc libexec/gnome-pty-helper -share/locale/am/LC_MESSAGES/vte-0.0.mo -share/locale/ang/LC_MESSAGES/vte-0.0.mo -share/locale/ar/LC_MESSAGES/vte-0.0.mo -share/locale/as/LC_MESSAGES/vte-0.0.mo -share/locale/ast/LC_MESSAGES/vte-0.0.mo -share/locale/az/LC_MESSAGES/vte-0.0.mo -share/locale/be/LC_MESSAGES/vte-0.0.mo -share/locale/be@latin/LC_MESSAGES/vte-0.0.mo -share/locale/bg/LC_MESSAGES/vte-0.0.mo -share/locale/bn/LC_MESSAGES/vte-0.0.mo -share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo -share/locale/bs/LC_MESSAGES/vte-0.0.mo -share/locale/ca/LC_MESSAGES/vte-0.0.mo -share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo -share/locale/cs/LC_MESSAGES/vte-0.0.mo -share/locale/cy/LC_MESSAGES/vte-0.0.mo -share/locale/da/LC_MESSAGES/vte-0.0.mo -share/locale/de/LC_MESSAGES/vte-0.0.mo -share/locale/dz/LC_MESSAGES/vte-0.0.mo -share/locale/el/LC_MESSAGES/vte-0.0.mo -share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo -share/locale/en_CA/LC_MESSAGES/vte-0.0.mo -share/locale/en_GB/LC_MESSAGES/vte-0.0.mo -share/locale/eo/LC_MESSAGES/vte-0.0.mo -share/locale/es/LC_MESSAGES/vte-0.0.mo -share/locale/et/LC_MESSAGES/vte-0.0.mo -share/locale/eu/LC_MESSAGES/vte-0.0.mo -share/locale/fa/LC_MESSAGES/vte-0.0.mo -share/locale/fi/LC_MESSAGES/vte-0.0.mo -share/locale/fr/LC_MESSAGES/vte-0.0.mo -share/locale/ga/LC_MESSAGES/vte-0.0.mo -share/locale/gl/LC_MESSAGES/vte-0.0.mo -share/locale/gu/LC_MESSAGES/vte-0.0.mo -share/locale/he/LC_MESSAGES/vte-0.0.mo -share/locale/hi/LC_MESSAGES/vte-0.0.mo -share/locale/hr/LC_MESSAGES/vte-0.0.mo -share/locale/hu/LC_MESSAGES/vte-0.0.mo -share/locale/id/LC_MESSAGES/vte-0.0.mo -share/locale/is/LC_MESSAGES/vte-0.0.mo -share/locale/it/LC_MESSAGES/vte-0.0.mo -share/locale/ja/LC_MESSAGES/vte-0.0.mo -share/locale/ka/LC_MESSAGES/vte-0.0.mo -share/locale/kn/LC_MESSAGES/vte-0.0.mo -share/locale/ko/LC_MESSAGES/vte-0.0.mo -share/locale/ku/LC_MESSAGES/vte-0.0.mo -share/locale/ky/LC_MESSAGES/vte-0.0.mo -share/locale/li/LC_MESSAGES/vte-0.0.mo -share/locale/lt/LC_MESSAGES/vte-0.0.mo -share/locale/lv/LC_MESSAGES/vte-0.0.mo -share/locale/mai/LC_MESSAGES/vte-0.0.mo -share/locale/mi/LC_MESSAGES/vte-0.0.mo -share/locale/mk/LC_MESSAGES/vte-0.0.mo -share/locale/ml/LC_MESSAGES/vte-0.0.mo -share/locale/mn/LC_MESSAGES/vte-0.0.mo -share/locale/mr/LC_MESSAGES/vte-0.0.mo -share/locale/ms/LC_MESSAGES/vte-0.0.mo -share/locale/nb/LC_MESSAGES/vte-0.0.mo -share/locale/ne/LC_MESSAGES/vte-0.0.mo -share/locale/nds/LC_MESSAGES/vte-0.0.mo -share/locale/nl/LC_MESSAGES/vte-0.0.mo -share/locale/nn/LC_MESSAGES/vte-0.0.mo -share/locale/oc/LC_MESSAGES/vte-0.0.mo -share/locale/or/LC_MESSAGES/vte-0.0.mo -share/locale/pa/LC_MESSAGES/vte-0.0.mo -share/locale/pl/LC_MESSAGES/vte-0.0.mo -share/locale/pt/LC_MESSAGES/vte-0.0.mo -share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo -share/locale/ro/LC_MESSAGES/vte-0.0.mo -share/locale/ru/LC_MESSAGES/vte-0.0.mo -share/locale/rw/LC_MESSAGES/vte-0.0.mo -share/locale/si/LC_MESSAGES/vte-0.0.mo -share/locale/sk/LC_MESSAGES/vte-0.0.mo -share/locale/sl/LC_MESSAGES/vte-0.0.mo -share/locale/sq/LC_MESSAGES/vte-0.0.mo -share/locale/sr/LC_MESSAGES/vte-0.0.mo -share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo -share/locale/sv/LC_MESSAGES/vte-0.0.mo -share/locale/ta/LC_MESSAGES/vte-0.0.mo -share/locale/te/LC_MESSAGES/vte-0.0.mo -share/locale/th/LC_MESSAGES/vte-0.0.mo -share/locale/tr/LC_MESSAGES/vte-0.0.mo -share/locale/ug/LC_MESSAGES/vte-0.0.mo -share/locale/uk/LC_MESSAGES/vte-0.0.mo -share/locale/vi/LC_MESSAGES/vte-0.0.mo -share/locale/wa/LC_MESSAGES/vte-0.0.mo -share/locale/xh/LC_MESSAGES/vte-0.0.mo -share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo -share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo -share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo -%%DATADIR%%/termcap/xterm -@dirrm %%DATADIR%%/termcap -@dirrm %%DATADIR%% -@dirrm lib/vte-0.0 -@dirrm include/vte-0.0/vte -@dirrm include/vte-0.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/nds/LC_MESSAGES -@dirrmtry share/locale/nds -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mi/LC_MESSAGES -@dirrmtry share/locale/mi -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/en@shaw/LC_MESSAGES -@dirrmtry share/locale/en@shaw -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as -@dirrmtry share/locale/ang/LC_MESSAGES -@dirrmtry share/locale/ang Modified: head/x11-toolkits/vte/Makefile ============================================================================== --- head/x11-toolkits/vte/Makefile Sun Dec 8 09:03:01 2013 (r335872) +++ head/x11-toolkits/vte/Makefile Sun Dec 8 09:55:41 2013 (r335873) @@ -1,52 +1,55 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/vte/Makefile 18940 2013-12-08 01:12:24Z kwm $ PORTNAME= vte PORTVERSION= 0.26.2 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org -COMMENT?= Terminal widget with improved accessibility and I18N support +COMMENT?= Gtk 2 based terminal widget with accessibility and I18N support USE_BZIP2= yes .if !defined(REFERENCE_PORT) -USE_GMAKE= yes -USES= bison pathfix gettext pkgconfig +RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper + +USES= bison gettext gmake pathfix pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool -USE_GNOME?= gnomeprefix gtk20 ltverhack referencehack +GNU_CONFIGURE= yes +USE_GNOME?= gnomeprefix gtk20 introspection:build ltverhack referencehack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS?=--disable-python \ --disable-Bsymbolic \ - --disable-freetypetest + --disable-freetypetest \ + --disable-static \ + --enable-introspection \ + --disable-gnome-pty-helper .if !defined(MASTERDIR) OPTIONS_DEFINE= GLX GLX_DESC= Support for DRI/GLX rendering .endif -NO_STAGE= yes .include +.if ${OSVERSION} < 900007 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c +.endif + .if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR) CONFIGURE_ARGS+= --with-glX USE_GL= yes .endif -.include - -.if ${OSVERSION} < 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c -.endif +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvte.so.9 -.include +.include .endif Modified: head/x11-toolkits/vte/pkg-plist ============================================================================== --- head/x11-toolkits/vte/pkg-plist Sun Dec 8 09:03:01 2013 (r335872) +++ head/x11-toolkits/vte/pkg-plist Sun Dec 8 09:55:41 2013 (r335873) @@ -7,7 +7,7 @@ include/vte-0.0/vte/vtedeprecated.h include/vte-0.0/vte/vtepty.h include/vte-0.0/vte/vtetypebuiltins.h include/vte-0.0/vte/vteversion.h -lib/libvte.a +lib/girepository-1.0/Vte-0.0.typelib lib/libvte.la lib/libvte.so lib/libvte.so.9 @@ -17,7 +17,7 @@ lib/vte-0.0/osc lib/vte-0.0/slowcat lib/vte-0.0/window libdata/pkgconfig/vte.pc -libexec/gnome-pty-helper +share/gir-1.0/Vte-0.0.gir share/locale/am/LC_MESSAGES/vte-0.0.mo share/locale/ang/LC_MESSAGES/vte-0.0.mo share/locale/ar/LC_MESSAGES/vte-0.0.mo Modified: head/x11-toolkits/vte3/Makefile ============================================================================== --- head/x11-toolkits/vte/Makefile Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/vte3/Makefile Sun Dec 8 09:55:41 2013 (r335873) @@ -1,31 +1,41 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/vte3/Makefile 18941 2013-12-08 01:18:10Z kwm $ -PORTNAME= vte -PORTVERSION= 0.26.2 -PORTREVISION?= 4 +PORTNAME?= vte +PORTVERSION= 0.34.7 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R} +DISTNAME= vte-${PORTVERSION} +PKGNAMESUFFIX?= 3 +DIST_SUBDIR= gnome3 MAINTAINER?= gnome@FreeBSD.org -COMMENT?= Terminal widget with improved accessibility and I18N support +COMMENT?= Gtk 3 based terminal widget with accessibility and I18N support -USE_BZIP2= yes +USE_XZ= yes .if !defined(REFERENCE_PORT) +VTE3_SLAVE?= no -USE_GMAKE= yes -USES= bison pathfix gettext pkgconfig +.if ${VTE3_SLAVE}!="yes" +RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper +.endif + +USES= bison gettext gmake pathfix pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool -USE_GNOME?= gnomeprefix gtk20 ltverhack referencehack +GNU_CONFIGURE= yes +USE_GNOME?= gnomeprefix gtk30 ltverhack referencehack introspection:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS?=--disable-python \ + --with-gtk=3.0 \ + --enable-introspection \ + --disable-static \ --disable-Bsymbolic \ + --disable-gnome-pty-helper \ --disable-freetypetest .if !defined(MASTERDIR) @@ -33,20 +43,24 @@ OPTIONS_DEFINE= GLX GLX_DESC= Support for DRI/GLX rendering .endif -NO_STAGE= yes +PLIST_SUB= VERSION=2.90 + .include +.if ${OSVERSION} < 900007 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c +.endif + .if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR) CONFIGURE_ARGS+= --with-glX USE_GL= yes .endif -.include - -.if ${OSVERSION} < 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c +.if ${VTE3_SLAVE}!=yes +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvte2_90.so.9 .endif -.include +.include .endif Modified: head/x11-toolkits/vte3/distinfo ============================================================================== --- head/x11-toolkits/vte/distinfo Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/vte3/distinfo Sun Dec 8 09:55:41 2013 (r335873) @@ -1,2 +1,2 @@ -SHA256 (gnome2/vte-0.26.2.tar.bz2) = f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd -SIZE (gnome2/vte-0.26.2.tar.bz2) = 1310863 +SHA256 (gnome3/vte-0.34.7.tar.xz) = 187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932 +SIZE (gnome3/vte-0.34.7.tar.xz) = 984068 Modified: head/x11-toolkits/vte3/pkg-plist ============================================================================== --- head/x11-toolkits/vte/pkg-plist Sun Dec 8 01:14:18 2013 (r335860) +++ head/x11-toolkits/vte3/pkg-plist Sun Dec 8 09:55:41 2013 (r335873) @@ -1,122 +1,145 @@ -bin/vte -include/vte-0.0/vte/pty.h -include/vte-0.0/vte/reaper.h -include/vte-0.0/vte/vte.h -include/vte-0.0/vte/vteaccess.h -include/vte-0.0/vte/vtedeprecated.h -include/vte-0.0/vte/vtepty.h -include/vte-0.0/vte/vtetypebuiltins.h -include/vte-0.0/vte/vteversion.h -lib/libvte.a -lib/libvte.la -lib/libvte.so -lib/libvte.so.9 -lib/vte-0.0/decset -lib/vte-0.0/interpret -lib/vte-0.0/osc -lib/vte-0.0/slowcat -lib/vte-0.0/window -libdata/pkgconfig/vte.pc -libexec/gnome-pty-helper -share/locale/am/LC_MESSAGES/vte-0.0.mo -share/locale/ang/LC_MESSAGES/vte-0.0.mo -share/locale/ar/LC_MESSAGES/vte-0.0.mo -share/locale/as/LC_MESSAGES/vte-0.0.mo -share/locale/ast/LC_MESSAGES/vte-0.0.mo -share/locale/az/LC_MESSAGES/vte-0.0.mo -share/locale/be/LC_MESSAGES/vte-0.0.mo -share/locale/be@latin/LC_MESSAGES/vte-0.0.mo -share/locale/bg/LC_MESSAGES/vte-0.0.mo -share/locale/bn/LC_MESSAGES/vte-0.0.mo -share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo -share/locale/bs/LC_MESSAGES/vte-0.0.mo -share/locale/ca/LC_MESSAGES/vte-0.0.mo -share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo -share/locale/cs/LC_MESSAGES/vte-0.0.mo -share/locale/cy/LC_MESSAGES/vte-0.0.mo -share/locale/da/LC_MESSAGES/vte-0.0.mo -share/locale/de/LC_MESSAGES/vte-0.0.mo -share/locale/dz/LC_MESSAGES/vte-0.0.mo -share/locale/el/LC_MESSAGES/vte-0.0.mo -share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo -share/locale/en_CA/LC_MESSAGES/vte-0.0.mo -share/locale/en_GB/LC_MESSAGES/vte-0.0.mo -share/locale/eo/LC_MESSAGES/vte-0.0.mo -share/locale/es/LC_MESSAGES/vte-0.0.mo -share/locale/et/LC_MESSAGES/vte-0.0.mo -share/locale/eu/LC_MESSAGES/vte-0.0.mo -share/locale/fa/LC_MESSAGES/vte-0.0.mo -share/locale/fi/LC_MESSAGES/vte-0.0.mo -share/locale/fr/LC_MESSAGES/vte-0.0.mo -share/locale/ga/LC_MESSAGES/vte-0.0.mo -share/locale/gl/LC_MESSAGES/vte-0.0.mo -share/locale/gu/LC_MESSAGES/vte-0.0.mo -share/locale/he/LC_MESSAGES/vte-0.0.mo -share/locale/hi/LC_MESSAGES/vte-0.0.mo -share/locale/hr/LC_MESSAGES/vte-0.0.mo -share/locale/hu/LC_MESSAGES/vte-0.0.mo -share/locale/id/LC_MESSAGES/vte-0.0.mo -share/locale/is/LC_MESSAGES/vte-0.0.mo -share/locale/it/LC_MESSAGES/vte-0.0.mo -share/locale/ja/LC_MESSAGES/vte-0.0.mo -share/locale/ka/LC_MESSAGES/vte-0.0.mo -share/locale/kn/LC_MESSAGES/vte-0.0.mo -share/locale/ko/LC_MESSAGES/vte-0.0.mo -share/locale/ku/LC_MESSAGES/vte-0.0.mo -share/locale/ky/LC_MESSAGES/vte-0.0.mo -share/locale/li/LC_MESSAGES/vte-0.0.mo -share/locale/lt/LC_MESSAGES/vte-0.0.mo -share/locale/lv/LC_MESSAGES/vte-0.0.mo -share/locale/mai/LC_MESSAGES/vte-0.0.mo -share/locale/mi/LC_MESSAGES/vte-0.0.mo -share/locale/mk/LC_MESSAGES/vte-0.0.mo -share/locale/ml/LC_MESSAGES/vte-0.0.mo -share/locale/mn/LC_MESSAGES/vte-0.0.mo -share/locale/mr/LC_MESSAGES/vte-0.0.mo -share/locale/ms/LC_MESSAGES/vte-0.0.mo -share/locale/nb/LC_MESSAGES/vte-0.0.mo -share/locale/ne/LC_MESSAGES/vte-0.0.mo -share/locale/nds/LC_MESSAGES/vte-0.0.mo -share/locale/nl/LC_MESSAGES/vte-0.0.mo -share/locale/nn/LC_MESSAGES/vte-0.0.mo -share/locale/oc/LC_MESSAGES/vte-0.0.mo -share/locale/or/LC_MESSAGES/vte-0.0.mo -share/locale/pa/LC_MESSAGES/vte-0.0.mo -share/locale/pl/LC_MESSAGES/vte-0.0.mo -share/locale/pt/LC_MESSAGES/vte-0.0.mo -share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo -share/locale/ro/LC_MESSAGES/vte-0.0.mo -share/locale/ru/LC_MESSAGES/vte-0.0.mo -share/locale/rw/LC_MESSAGES/vte-0.0.mo -share/locale/si/LC_MESSAGES/vte-0.0.mo -share/locale/sk/LC_MESSAGES/vte-0.0.mo -share/locale/sl/LC_MESSAGES/vte-0.0.mo -share/locale/sq/LC_MESSAGES/vte-0.0.mo -share/locale/sr/LC_MESSAGES/vte-0.0.mo -share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo -share/locale/sv/LC_MESSAGES/vte-0.0.mo -share/locale/ta/LC_MESSAGES/vte-0.0.mo -share/locale/te/LC_MESSAGES/vte-0.0.mo -share/locale/th/LC_MESSAGES/vte-0.0.mo -share/locale/tr/LC_MESSAGES/vte-0.0.mo -share/locale/ug/LC_MESSAGES/vte-0.0.mo -share/locale/uk/LC_MESSAGES/vte-0.0.mo -share/locale/vi/LC_MESSAGES/vte-0.0.mo -share/locale/wa/LC_MESSAGES/vte-0.0.mo -share/locale/xh/LC_MESSAGES/vte-0.0.mo -share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo -share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo -share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo -%%DATADIR%%/termcap/xterm -@dirrm %%DATADIR%%/termcap -@dirrm %%DATADIR%% -@dirrm lib/vte-0.0 -@dirrm include/vte-0.0/vte -@dirrm include/vte-0.0 +bin/vte2_90 +etc/profile.d/vte.sh +include/vte-%%VERSION%%/vte/pty.h +include/vte-%%VERSION%%/vte/reaper.h +include/vte-%%VERSION%%/vte/vte.h +include/vte-%%VERSION%%/vte/vteaccess.h +include/vte-%%VERSION%%/vte/vtedeprecated.h +include/vte-%%VERSION%%/vte/vtepty.h +include/vte-%%VERSION%%/vte/vtetypebuiltins.h +include/vte-%%VERSION%%/vte/vteversion.h +lib/girepository-1.0/Vte-%%VERSION%%.typelib +lib/libvte2_90.la +lib/libvte2_90.so +lib/libvte2_90.so.9 +libdata/pkgconfig/vte-%%VERSION%%.pc +share/doc/vte-2.90/VteReaper.html +share/doc/vte-2.90/VteTerminal.html +share/doc/vte-2.90/VteTerminalAccessible.html +share/doc/vte-2.90/annotation-glossary.html +share/doc/vte-2.90/api-index-0-20.html +share/doc/vte-2.90/api-index-0-24.html +share/doc/vte-2.90/api-index-0-26.html +share/doc/vte-2.90/api-index-0-28.html +share/doc/vte-2.90/api-index-0-34.html +share/doc/vte-2.90/api-index-deprecated.html +share/doc/vte-2.90/api-index-full.html +share/doc/vte-2.90/ch01.html +share/doc/vte-2.90/ch02.html +share/doc/vte-2.90/ch03.html +share/doc/vte-2.90/deprecated-objects.html +share/doc/vte-2.90/home.png +share/doc/vte-2.90/index.html +share/doc/vte-2.90/index.sgml +share/doc/vte-2.90/internal-objects.html +share/doc/vte-2.90/left.png +share/doc/vte-2.90/licence.html +share/doc/vte-2.90/object-hierarchy.html +share/doc/vte-2.90/pt01.html +share/doc/vte-2.90/right.png +share/doc/vte-2.90/style.css +share/doc/vte-2.90/up.png +share/doc/vte-2.90/vte-Version-Information.html +share/doc/vte-2.90/vte-Vte-PTY.html +share/doc/vte-2.90/vte-2.90.devhelp2 +share/gir-1.0/Vte-%%VERSION%%.gir +share/locale/am/LC_MESSAGES/vte-2.90.mo +share/locale/ang/LC_MESSAGES/vte-2.90.mo +share/locale/ar/LC_MESSAGES/vte-2.90.mo +share/locale/as/LC_MESSAGES/vte-2.90.mo +share/locale/ast/LC_MESSAGES/vte-2.90.mo +share/locale/az/LC_MESSAGES/vte-2.90.mo +share/locale/be/LC_MESSAGES/vte-2.90.mo +share/locale/be@latin/LC_MESSAGES/vte-2.90.mo +share/locale/bg/LC_MESSAGES/vte-2.90.mo +share/locale/bn/LC_MESSAGES/vte-2.90.mo +share/locale/bn_IN/LC_MESSAGES/vte-2.90.mo +share/locale/bs/LC_MESSAGES/vte-2.90.mo +share/locale/ca/LC_MESSAGES/vte-2.90.mo +share/locale/ca@valencia/LC_MESSAGES/vte-2.90.mo +share/locale/cs/LC_MESSAGES/vte-2.90.mo +share/locale/cy/LC_MESSAGES/vte-2.90.mo +share/locale/da/LC_MESSAGES/vte-2.90.mo +share/locale/de/LC_MESSAGES/vte-2.90.mo +share/locale/dz/LC_MESSAGES/vte-2.90.mo +share/locale/el/LC_MESSAGES/vte-2.90.mo +share/locale/en@shaw/LC_MESSAGES/vte-2.90.mo +share/locale/en_CA/LC_MESSAGES/vte-2.90.mo +share/locale/en_GB/LC_MESSAGES/vte-2.90.mo +share/locale/eo/LC_MESSAGES/vte-2.90.mo +share/locale/es/LC_MESSAGES/vte-2.90.mo +share/locale/et/LC_MESSAGES/vte-2.90.mo +share/locale/eu/LC_MESSAGES/vte-2.90.mo +share/locale/fa/LC_MESSAGES/vte-2.90.mo +share/locale/fi/LC_MESSAGES/vte-2.90.mo +share/locale/fr/LC_MESSAGES/vte-2.90.mo +share/locale/fur/LC_MESSAGES/vte-2.90.mo +share/locale/ga/LC_MESSAGES/vte-2.90.mo +share/locale/gl/LC_MESSAGES/vte-2.90.mo +share/locale/gu/LC_MESSAGES/vte-2.90.mo +share/locale/he/LC_MESSAGES/vte-2.90.mo +share/locale/hi/LC_MESSAGES/vte-2.90.mo +share/locale/hr/LC_MESSAGES/vte-2.90.mo +share/locale/hu/LC_MESSAGES/vte-2.90.mo +share/locale/id/LC_MESSAGES/vte-2.90.mo +share/locale/is/LC_MESSAGES/vte-2.90.mo +share/locale/it/LC_MESSAGES/vte-2.90.mo +share/locale/ja/LC_MESSAGES/vte-2.90.mo +share/locale/ka/LC_MESSAGES/vte-2.90.mo +share/locale/kn/LC_MESSAGES/vte-2.90.mo +share/locale/ko/LC_MESSAGES/vte-2.90.mo +share/locale/ku/LC_MESSAGES/vte-2.90.mo +share/locale/ky/LC_MESSAGES/vte-2.90.mo +share/locale/li/LC_MESSAGES/vte-2.90.mo +share/locale/lt/LC_MESSAGES/vte-2.90.mo +share/locale/lv/LC_MESSAGES/vte-2.90.mo +share/locale/mai/LC_MESSAGES/vte-2.90.mo +share/locale/mi/LC_MESSAGES/vte-2.90.mo +share/locale/mk/LC_MESSAGES/vte-2.90.mo +share/locale/ml/LC_MESSAGES/vte-2.90.mo +share/locale/mn/LC_MESSAGES/vte-2.90.mo +share/locale/mr/LC_MESSAGES/vte-2.90.mo +share/locale/ms/LC_MESSAGES/vte-2.90.mo +share/locale/nb/LC_MESSAGES/vte-2.90.mo +share/locale/ne/LC_MESSAGES/vte-2.90.mo +share/locale/nds/LC_MESSAGES/vte-2.90.mo +share/locale/nl/LC_MESSAGES/vte-2.90.mo +share/locale/nn/LC_MESSAGES/vte-2.90.mo +share/locale/oc/LC_MESSAGES/vte-2.90.mo +share/locale/or/LC_MESSAGES/vte-2.90.mo +share/locale/pa/LC_MESSAGES/vte-2.90.mo +share/locale/pl/LC_MESSAGES/vte-2.90.mo +share/locale/pt/LC_MESSAGES/vte-2.90.mo +share/locale/pt_BR/LC_MESSAGES/vte-2.90.mo +share/locale/ro/LC_MESSAGES/vte-2.90.mo +share/locale/ru/LC_MESSAGES/vte-2.90.mo +share/locale/rw/LC_MESSAGES/vte-2.90.mo +share/locale/si/LC_MESSAGES/vte-2.90.mo +share/locale/sk/LC_MESSAGES/vte-2.90.mo +share/locale/sl/LC_MESSAGES/vte-2.90.mo +share/locale/sq/LC_MESSAGES/vte-2.90.mo +share/locale/sr/LC_MESSAGES/vte-2.90.mo +share/locale/sr@latin/LC_MESSAGES/vte-2.90.mo +share/locale/sv/LC_MESSAGES/vte-2.90.mo +share/locale/ta/LC_MESSAGES/vte-2.90.mo +share/locale/te/LC_MESSAGES/vte-2.90.mo +share/locale/th/LC_MESSAGES/vte-2.90.mo +share/locale/tr/LC_MESSAGES/vte-2.90.mo +share/locale/ug/LC_MESSAGES/vte-2.90.mo +share/locale/uk/LC_MESSAGES/vte-2.90.mo +share/locale/uz@cyrillic/LC_MESSAGES/vte-2.90.mo +share/locale/vi/LC_MESSAGES/vte-2.90.mo +share/locale/wa/LC_MESSAGES/vte-2.90.mo +share/locale/xh/LC_MESSAGES/vte-2.90.mo +share/locale/zh_CN/LC_MESSAGES/vte-2.90.mo +share/locale/zh_HK/LC_MESSAGES/vte-2.90.mo +share/locale/zh_TW/LC_MESSAGES/vte-2.90.mo @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @@ -141,6 +164,8 @@ share/locale/zh_TW/LC_MESSAGES/vte-0.0.m @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @@ -157,3 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/vte-0.0.m @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang +@dirrmtry share/doc/vte-2.90 +@dirrmtry etc/profile.d +@dirrm include/vte-2.90/vte +@dirrm include/vte-2.90