From 33247f8627dc97a08c73196f8baf13f76c3ebee0 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 1 Apr 2013 15:16:27 +0000
Subject: Not complete yet. Trim header, remove leading "A" from comments.
Convert:
USE_GNOME=pkgconfig -> USE_PKGCONFIG=build
USE_GNOME=gnomehack -> USES=pathfix
Do some maintaince where needed, and let there be breakage! [1]
[1] But since nobody (can't) use(s) SVN yet to build this isn't a issue :)
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17271 df743ca5-7f9a-e211-a948-0013205c9059
---
Mk/bsd.gnome.mk | 2 +-
audio/libaudiofile/Makefile | 11 ++++-------
devel/gnome-common/Makefile | 2 +-
graphics/clutter/Makefile | 8 +++++---
graphics/cogl/Makefile | 10 ++++------
graphics/libchamplain/Makefile | 16 +++++++---------
graphics/libchamplain08/Makefile | 20 +++++++++-----------
net-im/farsight2/Makefile | 11 +++++------
net-im/farstream/Makefile | 12 +++++-------
net-im/libnice/Makefile | 11 +++++------
net-im/telepathy-farsight/Makefile | 23 ++++++++---------------
net-im/telepathy-farstream/Makefile | 26 +++++++++-----------------
net-im/telepathy-gabble/Makefile | 14 ++++++--------
net-im/telepathy-glib/Makefile | 14 ++++++--------
net-im/telepathy-haze/Makefile | 16 ++++++----------
net-im/telepathy-idle/Makefile | 22 +++++++---------------
net-im/telepathy-logger/Makefile | 4 ++--
net-im/telepathy-mission-control/Makefile | 13 ++++++-------
net-im/telepathy-salut/Makefile | 16 ++++++----------
print/libgnomecups/Makefile | 12 +++++-------
security/gcr/Makefile | 10 ++++------
textproc/yelp-tools/Makefile | 24 ++++++------------------
textproc/yelp-xsl/Makefile | 24 ++++++------------------
x11-themes/gnome-icon-theme-symbolic/Makefile | 4 +++-
24 files changed, 126 insertions(+), 199 deletions(-)
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 570cae1dc..8cb5f3243 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -278,7 +278,7 @@ oaf_USE_GNOME_IMPL= glib12 orbit libxml
gnomemimedata_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
-gnomemimedata_USE_GNOME_IMPL=gnomehier pkgconfig
+gnomemimedata_USE_GNOME_IMPL=gnomehier
GCONF_CONFIG?= ${LOCALBASE}/bin/gconf-config
gconf_LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index ab8f20bf8..2e8d9ccf7 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: libaudiofile
-# Date created: 22 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= libaudiofile
PORTVERSION= 0.3.2
@@ -14,13 +10,14 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A sound library for SGI audio file
+COMMENT= Sound library for SGI audio file
CONFLICTS= osalp-0.7.*
USE_XZ= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack pkgconfig
+USES= pathfix
+USE_PKGCONFIG= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 11ce2b614..e699c9b1d 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -13,7 +13,7 @@ COMMENT= Common automake macros for GNOME 2 and GNOME 3
USE_XZ= yes
USE_GMAKE= yes
-USE_GNOME= pkgconfig
+USE_PKGCONFIG= build
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 25230fede..d1f773ec4 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -14,14 +14,16 @@ COMMENT= OpenGL based interactive canvas library
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= json-glib-1.0.0:${PORTSDIR}/devel/json-glib \
- cogl.9:${PORTSDIR}/graphics/cogl
+LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib \
+ cogl:${PORTSDIR}/graphics/cogl
USE_GMAKE= yes
USE_GETTEXT= yes
USE_XZ= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gdkpixbuf2 ltverhack gnomeprefix atk pango
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index 751c7b7d2..961270f95 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: clutter
-# Date created: 2008-12-25
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= cogl
PORTVERSION= 1.10.4
@@ -25,7 +21,9 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_XZ= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gdkpixbuf2 ltverhack gnomeprefix atk pango
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 388236885..df95fc9dc 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: libchamplain
-# Date Created: 04 Aug 2009
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= libchamplain
PORTVERSION= 0.12.3
@@ -12,14 +8,16 @@ CATEGORIES= graphics
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps and markers
+COMMENT= C library aimed to provide a Gtk+ widget to display rasterized maps and markers
BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS= clutter-gtk-1.0.0:${PORTSDIR}/graphics/clutter-gtk3 \
- soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS= clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \
+ soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome
USE_XZ= yes
-USE_GNOME= pkgconfig gtk30 gnomehack ltverhack gnomehier
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gtk30 ltverhack gnomehier
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_SQLITE= yes
diff --git a/graphics/libchamplain08/Makefile b/graphics/libchamplain08/Makefile
index f297c7508..89cf59deb 100644
--- a/graphics/libchamplain08/Makefile
+++ b/graphics/libchamplain08/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: libchamplain
-# Date Created: 04 Aug 2009
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= libchamplain
PORTVERSION= 0.8.3
@@ -12,21 +8,23 @@ CATEGORIES= graphics
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps and markers
+COMMENT= C library aimed to provide a Gtk+ widget to display rasterized maps and markers
-LIB_DEPENDS= clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
- soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS= clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk \
+ soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome
LATEST_LINK= libchamplain08
USE_BZIP2= yes
-USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1 gnomehier
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gtk20 ltverhack:1 gnomehier
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_SQLITE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=0.8
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index f085e6252..cbf543195 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: farsight2
-# Date created: 27 February 2009
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
# $MCom$
@@ -13,7 +10,7 @@ MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of GStreamer modules and libraries for videoconferencing
-LIB_DEPENDS= nice.10:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice
CONFLICTS= farstream-[0-9]*
@@ -22,7 +19,9 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack
USE_GSTREAMER= core good bad python
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index 6e2cbcfaa..b57e8a2b8 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: farsight2
-# Date created: 27 February 2009
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= farstream
PORTVERSION= 0.1.2
@@ -14,7 +10,7 @@ MASTER_SITES= http://freedesktop.org/software/farstream/releases/farstream/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of GStreamer modules and libraries for videoconferencing
-LIB_DEPENDS= nice.10:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice
CONFLICTS= farsight2-[0-9]*
@@ -23,7 +19,9 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack
USE_GSTREAMER= core good bad python
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index b80568023..780471c7b 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for: libnice
-# Date created: 27 February 2009
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-#
+# $MCom$
PORTNAME= libnice
PORTVERSION= 0.1.3
@@ -16,7 +13,9 @@ COMMENT= Library and transmitter that implements ICE-19
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack
USE_GSTREAMER= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-gstreamer --with-gstreamer-0.10
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 1f0df9e51..158d226c1 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for: telepathy-farsight
-# Date created: 27 February 2009
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-#
+# $MCom$
PORTNAME= telepathy-farsight
PORTVERSION= 0.0.19
@@ -13,22 +10,18 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Farsight Connection Manager for Telepathy Framework
-LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
- dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
- telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
- farsight2-0.10.pc:${PORTSDIR}/net-im/farsight2
-
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-
-BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+ telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+ gstfarsight-0.10:${PORTSDIR}/net-im/farsight2
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack libxslt:build
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index bff334cd0..55a8ad706 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: telepathy-farsight
-# Date created: 27 February 2009
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
# $MCom
-#
PORTNAME= telepathy-farstream
PORTVERSION= 0.4.0
@@ -14,23 +10,19 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Farstream Connection Manager for Telepathy Framework
-LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
- dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
- telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
- farstream-0.1.pc:${PORTSDIR}/net-im/farstream
-
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-
-BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+ telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+ farstream-0.1:${PORTSDIR}/net-im/farstream
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack libxslt:build
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
.include <bsd.port.mk>
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 7033c0b2d..7bad519bc 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: telepathy-gabble
-# Date created: Apr 19 2007
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
# $MCom$
@@ -13,8 +10,7 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Jabber Connection Manager for Telepathy Framework
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
- telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \
+BUILD_DEPENDS= telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \
nice:${PORTSDIR}/net-im/libnice \
@@ -25,9 +21,11 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
GNU_CONFIGURE= yes
-LDFLAGS+= ${PTHREAD_LIBS}
+LDFLAGS+= -pthread
USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig glib20
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 libxslt:build
USE_SQLITE= yes
USE_OPENSSL= yes
USE_PYTHON_BUILD= yes
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 272dd2b88..26553f34f 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: telepathy-glib
-# Date created: Apr 19 2007
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
# $MCom$
@@ -13,16 +10,17 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= GLib utility library for the Telepathy framework
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
- vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
+BUILD_DEPENDS= vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnomehier
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 ltverhack gnomehier libxslt:build
USE_PYTHON_BUILD= yes
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 499c672ed..7f16e4ada 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: telepathy-haze
-# Date created: 2007-10-29
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= telepathy-haze
PORTVERSION= 0.6.0
@@ -14,12 +10,12 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-haze/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Libpurple connection manager for telepathy
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \
- idn.17:${PORTSDIR}/dns/libidn \
- telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS= purple:${PORTSDIR}/net-im/libpurple \
+ idn:${PORTSDIR}/dns/libidn \
+ telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
-USE_GNOME= pkgconfig
+USES= pathfix
+USE_GNOME= libxslt:build
CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION}
GNU_CONFIGURE= yes
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 11bec2bc2..6af0bb946 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: telepathy-idle
-# Date created: Apr 19 2007
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= telepathy-idle
PORTVERSION= 0.1.11
@@ -14,20 +10,16 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= IRC Connection Manager for Telepathy Framework
-LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
- dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
- telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib
-
-BUILD_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
- xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
+ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+ telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig glib20
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= glib20 libxslt:build
MAN8= telepathy-idle.8
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index fa02b1fb0..d6e80cef8 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_GNOME= gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
- libxslt:build
+USES= pathfix
+USE_GNOME= glib20 intltool gnomedocutils ltverhack libxml2 libxslt:build
USE_PKGCONFIG= build
USE_SQLITE= yes
USE_PYTHON_BUILD= yes
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 09680f2bb..e713d5c91 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: telepathy-mission-control
-# Date created: 2007-10-29
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
# $MCom$
@@ -13,10 +10,12 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-contro
MAINTAINER= gnome@FreeBSD.org
COMMENT= Telepathy component to apps to abstract details of connection managers
-LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= telepathy:${PORTSDIR}/net-im/libtelepathy \
+ dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gnomeprefix gconf2 libxslt ltverhack
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index d62ccefb9..44917628b 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: telepathy-salut
-# Date created: Apr 16 2007
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= telepathy-salut
PORTVERSION= 0.8.0
@@ -14,14 +10,14 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Link-local Connection Manager for Telepathy Framework
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= avahi-glib.1:${PORTSDIR}/net/avahi-app \
- telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
- soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS= avahi-glib:${PORTSDIR}/net/avahi-app \
+ telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+ soup-2.4:${PORTSDIR}/devel/libsoup
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack glib20
+USES= pathfix
+USE_GNOME= glib20 libxslt:build
USE_PKGCONFIG= build
USE_OPENSSL= yes
USE_PYTHON_BUILD= yes
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 8b10ce06d..b988f3397 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libgnomecups
-# Date created: 14 Jul 2003
-# Whom: Glenn Johnson <glennpj@charter.net>
-#
+# Created by: Glenn Johnson <glennpj@charter.net>
# $FreeBSD$
-#
PORTNAME= libgnomecups
PORTVERSION= 0.2.3
@@ -16,11 +12,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Support library for gnome cups administration
-LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client
+LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack ltverhack glib20 pkgconfig
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= intlhack ltverhack glib20
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 142c060f2..d4c1d6f42 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gcr
-# Date Created: 26 May 2012
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= gcr
PORTVERSION= 3.4.1
@@ -26,7 +22,9 @@ RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
CONFLICTS= gnome-keyring-3.[0-2].[0-9]* gnome-keyring-2.[0-9]*
USE_XZ= yes
-USE_GNOME= gnomehack gtk30 pkgconfig intlhack
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gtk30 intlhack
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index d6232d20f..3c9da00e0 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: yelp-tools
-# Date created: 17 Sep 2011
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= yelp-tools
PORTVERSION= 3.4.1
@@ -17,23 +13,15 @@ COMMENT= Utilities to help manage documentation for Yelp and the web
BUILD_DEPENDS= yelp-xsl>=3.1.5:${PORTSDIR}/textproc/yelp-xsl \
itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt
USE_GETTEXT= yes
USE_XZ= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig libxml2
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gnomeprefix intlhack libxml2 libxslt
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector
-.include <bsd.port.pre.mk>
-
-# Around the time GCC stack protection (aka Propolice) for userland
-# was enabled on src/share/mk/bsd.sys.mk
-# SVN rev 180012 on 2008-06-25 21:33:28Z by ru
-.if ${OSVERSION} >= 800040
-LDFLAGS+= -fstack-protector
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index 15f9aae42..6256661ca 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: yelp
-# Date created: 18 May 2002
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
# $MCom$
-#
PORTNAME= yelp-xsl
PORTVERSION= 3.4.2
@@ -16,23 +12,15 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= DocBook XSLT stylesheets for yelp
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt
#USE_GETTEXT= yes
USE_XZ= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig libxml2
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gnomeprefix intlhack libxml2 libxslt
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector
-.include <bsd.port.pre.mk>
-
-# Around the time GCC stack protection (aka Propolice) for userland
-# was enabled on src/share/mk/bsd.sys.mk
-# SVN rev 180012 on 2008-06-25 21:33:28Z by ru
-.if ${OSVERSION} >= 800040
-LDFLAGS+= -fstack-protector
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icon-theme-symbolic/Makefile b/x11-themes/gnome-icon-theme-symbolic/Makefile
index f0efc7f87..62657e778 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Makefile
+++ b/x11-themes/gnome-icon-theme-symbolic/Makefile
@@ -15,7 +15,9 @@ BUILD_DEPENDS= icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
USE_XZ= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnomeprefix pkgconfig
+USES= pathfix
+USE_PKGCONFIG= build
+USE_GNOME= gnomeprefix
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
--
cgit v1.2.3