From 65b53dfde8bfeb6ae17c3e99a409dc36324e8dd9 Mon Sep 17 00:00:00 2001 From: kwm Date: Fri, 26 Apr 2013 21:23:07 +0000 Subject: Massive port framework maintaince/update (long over due too) Deal with recent USES changes, pet portlint here and there. Sync with ports, more to come. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18393 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gdl3/Makefile | 13 ++++--------- x11-toolkits/gnome-pty-helper/Makefile | 11 ++++------- x11-toolkits/gtk30/Makefile | 4 +--- x11-toolkits/gtkmm30/Makefile | 3 +-- x11-toolkits/libwnck/Makefile | 7 +++---- x11-toolkits/libwnck3/Makefile | 7 +++---- x11-toolkits/mx/Makefile | 20 +++++++------------- x11-toolkits/pango/Makefile | 5 ++--- x11-toolkits/pangomm/Makefile | 13 ++++--------- x11-toolkits/vte/Makefile | 14 +++++++------- x11-toolkits/vte3/Makefile | 14 +++++++------- 11 files changed, 43 insertions(+), 68 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/gdl3/Makefile b/x11-toolkits/gdl3/Makefile index 9a466c238..fee1be3a4 100644 --- a/x11-toolkits/gdl3/Makefile +++ b/x11-toolkits/gdl3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gdl -# Date created: 24 July 2001 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-toolkits/gdl3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gdl PORTVERSION= 3.4.2 @@ -16,13 +12,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Components intended to be shared between GNOME development tools LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING LATEST_LINK= gdl3 USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk30 intltool -USE_GETTEXT= yes +USE_GNOME= gnomeprefix gtk30 intltool +USES= gettext pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile index 35edb5157..3c4200b51 100644 --- a/x11-toolkits/gnome-pty-helper/Makefile +++ b/x11-toolkits/gnome-pty-helper/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vte -# Date created: 05 October 2002 -# Whom: Joe Marcus Clarke -# +# Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-toolkits/gnome-pty-helper/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-pty-helper PORTREVISION= 0 @@ -17,7 +13,8 @@ MASTERDIR= ${.CURDIR}/../../x11-toolkits/vte3 WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomeprefix gnomehack +USES= pathfix +USE_GNOME= gnomeprefix CONFIGURE_ARGS= # empty PATCH_STRIP= -p1 EXTRA_PATCHES+= ${MASTERDIR}/files/patch-gnome-pty-helper_Makefile.in \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index d6be8748d..b16baf0fc 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -32,10 +32,8 @@ USE_PERL5_BUILD=yes MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_PKGCONFIG= build -USES= pathfix USE_GNOME= atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-gtk2-dependency --disable-packagekit diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 606e9ff8d..b9fbffb11 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -20,11 +20,10 @@ LATEST_LINK= gtkmm30 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USES= pathfix USE_GNOME= gtk30 ltverhack glibmm cairomm atkmm pangomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index df8a63cf2..181c11a86 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-toolkits/libwnck/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libwnck PORTVERSION= 2.30.7 @@ -17,16 +17,15 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection CONFLICTS= libwnck-3.[0-9]* -USE_GETTEXT= yes USE_XORG= xres x11 USE_GMAKE= yes USE_GNOME= gtk20 ltverhack referencehack intlhack -USES= bison pathfix +USES= bison gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile index 0b7d4a3f1..83673054a 100644 --- a/x11-toolkits/libwnck3/Makefile +++ b/x11-toolkits/libwnck3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-toolkits/libwnck3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libwnck PORTVERSION= 3.4.2 @@ -17,17 +17,16 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection CONFLICTS= libwnck-2.[0-9]* LATEST_LINK= libwnck3 -USE_GETTEXT= yes USE_XORG= xres x11 USE_GMAKE= yes USE_GNOME= gtk30 ltverhack referencehack intlhack -USES= bison pathfix +USES= bison gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-toolkits/mx/Makefile b/x11-toolkits/mx/Makefile index 33c3048a9..cac0ad3a9 100644 --- a/x11-toolkits/mx/Makefile +++ b/x11-toolkits/mx/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: mx -# Date created: 30 Mar 2011 -# Whom: Koop Mast -# +# Created by: Koop Mast # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-toolkits/mx/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= mx PORTVERSION= 1.2.1 @@ -16,18 +12,16 @@ COMMENT= Clutter based widget toolkit LICENSE= LGPL21 -LIB_DEPENDS= clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \ - startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter \ + startup-notification-1:${PORTSDIR}/x11/startup-notification \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix USE_XZ= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack glib20 gtk20 intlhack ltverhack +USE_GNOME= glib20 gtk20 intlhack ltverhack USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" - CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index c4ba6a9e4..f5f1e5d46 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-toolkits/pango/Makefile 17278 2013-04-01 21:57:50Z kwm $ PORTNAME= pango PORTVERSION= 1.34.0 @@ -26,12 +26,11 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USES= pathfix USE_GNOME= glib20 ltverhack referencehack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index 0fc17a296..8cc64a6ac 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: pangomm -# Date created: 23 July 2008 -# Whom: Joe Marcus Clarke -# +# Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-toolkits/pangomm/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= pangomm PORTVERSION= 2.28.4 @@ -20,14 +16,13 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ - cairomm-1.0.1:${PORTSDIR}/graphics/cairomm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pango +USES= pathfix +USE_GNOME= pango glibmm cairomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-documentation \ diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 7eb97a76e..1a6877259 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-toolkits/vte/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= vte PORTVERSION= 0.26.2 @@ -19,10 +19,9 @@ USE_BZIP2= yes RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper USE_GMAKE= yes -USES= bison pathfix +USES= bison gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GETTEXT= yes USE_GNOME?= gnomeprefix gtk20 ltverhack referencehack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -32,20 +31,21 @@ CONFIGURE_ARGS?=--disable-python \ --disable-gnome-pty-helper .if !defined(MASTERDIR) -OPTIONS= GLX "Enable support for DRI/GLX rendering" off +OPTIONS_DEFINE= GLX +GLX_DESC= Support for DRI/GLX rendering .endif -.include +.include .if ${OSVERSION} < 900007 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c .endif -.if defined(WITH_GLX) && !defined(MASTERDIR) +.if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR) CONFIGURE_ARGS+= --with-glX USE_GL= yes .endif -.include +.include .endif diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index 2dc5e6183..5943ab921 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-toolkits/vte3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME?= vte PORTVERSION= 0.32.2 @@ -25,10 +25,9 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gno LATEST_LINK?= vte3 USE_GMAKE= yes -USES= bison pathfix +USES= bison gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GETTEXT= yes USE_GNOME?= gnomeprefix gtk30 ltverhack referencehack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -40,22 +39,23 @@ CONFIGURE_ARGS?=--disable-python \ --disable-freetypetest .if !defined(MASTERDIR) -OPTIONS= GLX "Enable support for DRI/GLX rendering" off +OPTIONS_DEFINE= GLX +GLX_DESC= Support for DRI/GLX rendering .endif PLIST_SUB= VERSION=2.90 -.include +.include .if ${OSVERSION} < 900007 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c .endif -.if defined(WITH_GLX) && !defined(MASTERDIR) +.if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR) CONFIGURE_ARGS+= --with-glX USE_GL= yes .endif -.include +.include .endif -- cgit v1.2.3