diff options
277 files changed, 1163 insertions, 2047 deletions
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index e346aa3ab..3f042eddd 100644 --- a/accessibility/accerciser/Makefile +++ b/accessibility/accerciser/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: accerciser -# Date created: 2007-09-17 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/accerciser/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= accerciser PORTVERSION= 1.12.1 @@ -22,7 +18,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pygnomedesktop atspi intlhack USE_PYTHON= yes -USE_GETTEXT= yes +USES= gettext pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/accessibility/accerciser3/Makefile b/accessibility/accerciser3/Makefile index 63a14e340..d8abc7cea 100644 --- a/accessibility/accerciser3/Makefile +++ b/accessibility/accerciser3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: accerciser -# Date created: 2007-09-17 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/accerciser3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= accerciser PORTVERSION= 3.4.1 @@ -26,7 +22,7 @@ USE_XZ= yes USE_GMAKE= yes USE_GNOME= gtk30 pygobject3 intlhack USE_PYTHON= yes -USE_GETTEXT= yes +USES= gettext pkgconfig INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_DISPLAY= yes diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile index ddcc33f88..7a1bb29c1 100644 --- a/accessibility/at-spi2-core/Makefile +++ b/accessibility/at-spi2-core/Makefile @@ -18,12 +18,10 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus PORTSCOUT= limitw:1,even +USES= pathfix pkgconfig gettext USE_XZ= yes -USE_GETTEXT= yes USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomehier glib20 intlhack -USE_PKGCONFIG= build USE_XORG= x11 xi xtst xext USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 24de9c066..8f407c987 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -18,13 +18,11 @@ USE_XZ= yes BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USES= pathfix +USES= pathfix gettext pkgconfig USE_GNOME= gnomehier glib20 ltverhack referencehack -USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile index df75834b9..13a777fcb 100644 --- a/accessibility/caribou/Makefile +++ b/accessibility/caribou/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: caribou -# Date created: 10 Juni 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/caribou/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= caribou PORTVERSION= 0.4.3 @@ -19,19 +15,18 @@ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \ - gee.2:${PORTSDIR}/devel/libgee06 \ - xklavier.12:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter \ + gee:${PORTSDIR}/devel/libgee06 \ + xklavier:${PORTSDIR}/x11/libxklavier RUN_DEPENDS= py*-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi USE_XZ= yes USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_PYTHON= yes USE_XORG= x11 xtst -USE_GNOME= gnomehack intltool pygobject3 gtk30 intlhack gnomedocutils \ - libxml2 +USE_GNOME= intltool pygobject3 gtk30 intlhack gnomedocutils libxml2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile index c7e9532ed..b0a634cb2 100644 --- a/accessibility/mousetweaks/Makefile +++ b/accessibility/mousetweaks/Makefile @@ -1,10 +1,6 @@ -# Ports collection makefile for: mousetweaks -# Date created: 2008 01 10 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/mousetweaks/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= mousetweaks PORTVERSION= 2.32.1 @@ -19,9 +15,9 @@ CONFLICTS= mousetweaks-3.[0-9]* USE_XORG= x11 xfixes xcursor xtst USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack +USE_GNOME= gnomeprefix gnomepanel intlhack USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/accessibility/mousetweaks3/Makefile b/accessibility/mousetweaks3/Makefile index 19b81800f..a7d4357c7 100644 --- a/accessibility/mousetweaks3/Makefile +++ b/accessibility/mousetweaks3/Makefile @@ -1,10 +1,6 @@ -# Ports collection makefile for: mousetweaks -# Date created: 2008 01 10 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/mousetweaks3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= mousetweaks PORTVERSION= 3.4.2 @@ -23,9 +19,9 @@ CONFLICTS= mousetweaks-2.[0-9]* LATEST_LINK= mousetweaks3 USE_XORG= x11 xfixes xcursor xtst USE_XZ= yes -USE_GNOME= gnomehack gnomeprefix intlhack gnomedocutils gtk30 +USE_GNOME= gnomeprefix intlhack gnomedocutils gtk30 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 8ae0b6d0b..cb0cf535e 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: orca -# Date created: 25 Jul 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/orca/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= orca PORTVERSION= 2.32.1 @@ -19,7 +15,7 @@ COMMENT= Scriptable screen reader BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg -LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag +LIB_DEPENDS= gnome-mag:${PORTSDIR}/accessibility/gnome-mag RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg @@ -29,11 +25,10 @@ CONFLICTS= orca-3.[0-9]* py*-json-py-[0-9]* LATEST_LINK= gnome-orca USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_PYTHON= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \ - pygnomedesktop +USE_GNOME= gnomeprefix libgnomeui gnomespeech pygnome2 pygnomedesktop INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/accessibility/orca3/Makefile b/accessibility/orca3/Makefile index 993116d9f..68efbfb55 100644 --- a/accessibility/orca3/Makefile +++ b/accessibility/orca3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: orca -# Date created: 25 Jul 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/accessibility/orca3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= orca PORTVERSION= 3.4.2 @@ -19,7 +15,7 @@ COMMENT= Scriptable screen reader BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo -LIB_DEPENDS= atspi.0:${PORTSDIR}/accessibility/at-spi2-core +LIB_DEPENDS= atspi:${PORTSDIR}/accessibility/at-spi2-core RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo @@ -31,10 +27,10 @@ CONFLICTS= orca-2.[0-9]* py*-json-py-[0-9]* LATEST_LINK= gnome-orca3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_PYTHON= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk30 pygobject3 gnomedocutils +USE_GNOME= gnomeprefix gtk30 pygobject3 gnomedocutils INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile index 4fca85225..ce1244b39 100644 --- a/accessibility/py-atspi/Makefile +++ b/accessibility/py-atspi/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/accessibility/py-atspi/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= atspi PORTVERSION= 2.8.0 @@ -19,9 +19,8 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at CONFLICTS= at-spi-1.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomehier intlhack pygobject3 GNU_CONFIGURE= yes USE_PYTHON= yes diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index f2bc3d2fd..f91879095 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -20,12 +20,11 @@ CONFLICTS= file-roller-3.[0-9]* USE_LDCONFIG= yes USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \ - gtk20 gconf2 +USE_GNOME= gnomeprefix intlhack gnomedocutils gtk20 gconf2 USE_XORG= sm GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -56,7 +55,6 @@ post-patch: ${WRKSRC}/src/fr-command-zip.c post-install: - @-update-desktop-database .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 6af23090c..9f6b6df43 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -305,8 +305,6 @@ share/omf/file-roller/file-roller-zh_CN.omf @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm libexec/file-roller -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile index 910b55461..397ea7332 100644 --- a/archivers/file-roller3/Makefile +++ b/archivers/file-roller3/Makefile @@ -19,11 +19,10 @@ CONFLICTS= file-roller-2.[0-9]* LATEST_LINK= file-roller3 USE_LDCONFIG= yes USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \ - gtk30 gconf2 +USE_GNOME= gnomeprefix intlhack gnomedocutils gtk30 gconf2 USE_XORG= sm GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -54,7 +53,6 @@ post-patch: ${WRKSRC}/src/fr-command-zip.c post-install: - @-update-desktop-database .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} diff --git a/archivers/file-roller3/pkg-plist b/archivers/file-roller3/pkg-plist index b155c47b0..f23e708b6 100644 --- a/archivers/file-roller3/pkg-plist +++ b/archivers/file-roller3/pkg-plist @@ -693,5 +693,3 @@ share/locale/zu/LC_MESSAGES/file-roller.mo @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm libexec/file-roller -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/audio/gstreamer-plugins-pulse/Makefile b/audio/gstreamer-plugins-pulse/Makefile index 64c4a0ec9..75e9f9967 100644 --- a/audio/gstreamer-plugins-pulse/Makefile +++ b/audio/gstreamer-plugins-pulse/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gstreamer-plugins-pulse -# Date created: July 22, 2006 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# PORTREVISION= 1 CATEGORIES= audio diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index 719328d92..dbeb3ef41 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libcanberra -# Date created: 05 August 2008 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 2 CATEGORIES= audio devel diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index b806a0da2..15b21702b 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: polypaudio -# Date created: 29 October 2004 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/audio/pulseaudio/Makefile 17268 2013-04-01 05:13:11Z marcus $ # # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by # PORTREVISION bumps of depending ports. -# PORTNAME= pulseaudio PORTVERSION= 2.0 @@ -29,10 +25,10 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ ck-connector:${PORTSDIR}/sysutils/consolekit USE_XZ= yes -USE_GNOME= gnomehack glib20 intltool ltverhack gnomehier +USE_GNOME= glib20 intltool ltverhack gnomehier USE_XORG= x11 sm xtst ice USE_LDCONFIG= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl libtool USE_GMAKE= yes @@ -70,7 +66,7 @@ MAN1= esdcompat.1 pacat.1 pacmd.1 pactl.1 padsp.1 \ MAN5= default.pa.5 pulse-cli-syntax.5 pulse-client.conf.5 \ pulse-daemon.conf.5 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack @@ -120,6 +116,8 @@ CONFIGURE_ARGS+=--enable-orc CONFIGURE_ARGS+=--disable-orc .endif +.include <bsd.port.pre.mk> + # OSVERSION wasn't bumped after the MFC. So we need to use the next bump. # Sadly for 7-stable the OSVERSION wasn't bumped after 7.4-R .if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \ diff --git a/audio/rhythmbox3/Makefile b/audio/rhythmbox3/Makefile index 5d2802388..98b98512c 100644 --- a/audio/rhythmbox3/Makefile +++ b/audio/rhythmbox3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: rhythmbox -# Date created: 17 August 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/audio/rhythmbox3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= rhythmbox PORTVERSION= 2.90.1.1 @@ -19,24 +15,24 @@ COMMENT= Audio player for GNOME BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - peas-1.0.0:${PORTSDIR}/devel/libpeas \ - json-glib-1.0.0:${PORTSDIR}/devel/json-glib \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ - gnome-media-profiles-3.0.0:${PORTSDIR}/multimedia/libgnome-media-profiles \ - brasero-media3.3:${PORTSDIR}/sysutils/brasero3 +LIB_DEPENDS= musicbrainz3:${PORTSDIR}/audio/libmusicbrainz3 \ + totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + peas-1.0:${PORTSDIR}/devel/libpeas \ + json-glib-1.0:${PORTSDIR}/devel/json-glib \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ + gnome-media-profiles-3.0:${PORTSDIR}/multimedia/libgnome-media-profiles \ + brasero-media3:${PORTSDIR}/sysutils/brasero3 CONFLICTS= rhythmbox-0.[0-9]* LATEST_LINK= rhythmbox3 USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix INSTALLS_OMF= yes USE_XORG= ice xproto USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gtk30 +USE_GNOME= intlhack gnomeprefix gtk30 WANT_GNOME= yes USE_GSTREAMER= flac mp3 jpeg cdparanoia vorbis USE_AUTOTOOLS= libtool @@ -49,27 +45,24 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" GLIB_SCHEMAS= org.gnome.rhythmbox.gschema.xml +OPTIONS_DEFINE= IPOD FAAD NOTIFY PYTHON LIRC MTP WEBKIT ITMS_PLUGIN +OPTIONS_DEFAULT=NOTIFY PYTHON +IPOD_DESC= iPod support +ITMS_PLUGIN_DESC=iTunes browser plugin +WEBKIT_DESC= HTML view support #OPTIONS= DAAP "Enable iTunes music sharing" off \ -OPTIONS= IPOD "Enable iPod support" off \ - FAAD "Enable FAAD decoder support" off \ - NOTIFY "Enable libnotify support" on \ - PYTHON "Enable python based plugins" on \ - LIRC "Enable Infrared syncing support" off \ - MTP "Enable MS Media Transfer Protocol support" off \ - WEBKIT "Enable HTML view" off \ - ITMS_PLUGIN "Enable iTunes browser plugin" off # VISUAL "Enable clutter visualizer plugin" on \ MAN1= rhythmbox-client.1 rhythmbox.1 .include <bsd.port.options.mk> -.if defined(WITH_FAAD) +.if ${PORT_OPTIONS:MFAAD} USE_GSTREAMER+= faad .endif -.if defined(WITH_LIRC) -LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc +.if ${PORT_OPTIONS:MFAAD} +LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc PLIST_SUB+= LIRC="" CONFIGURE_ARGS+=--enable-lirc .else @@ -77,9 +70,9 @@ CONFIGURE_ARGS+=--disable-lirc PLIST_SUB+= LIRC="@comment " .endif -.if defined(WITH_MTP) -LIB_DEPENDS+= mtp.11:${PORTSDIR}/audio/libmtp \ - hal.1:${PORTSDIR}/sysutils/hal +.if ${PORT_OPTIONS:MMTP} +LIB_DEPENDS+= mtp:${PORTSDIR}/audio/libmtp \ + hal:${PORTSDIR}/sysutils/hal PLIST_SUB+= MTP="" CONFIGURE_ARGS+=--with-mtp .else @@ -101,15 +94,15 @@ CONFIGURE_ARGS+=--disable-daap PLIST_SUB+= DAAP="@comment " #.endif -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify PLIST_SUB+= NOTIFY="" .else CONFIGURE_ARGS+=--disable-libnotify PLIST_SUB+= NOTIFY="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes USE_GSTREAMER+= python CONFIGURE_ARGS+=--enable-python @@ -119,8 +112,8 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif -.if !defined(WITHOUT_IPOD) -LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod +.if ${PORT_OPTIONS:MIPOD} +LIB_DEPENDS+= gpod:${PORTSDIR}/audio/libgpod CONFIGURE_ARGS+=--with-ipod PLIST_SUB+= IPOD="" .else @@ -128,8 +121,9 @@ CONFIGURE_ARGS+=--without-ipod PLIST_SUB+= IPOD="@comment " .endif -.if !defined(WITHOUT_ITMS_PLUGIN) -USE_WEBPLUGINS= gecko19 webkit-gtk3 +.if ${PORT_OPTIONS:MITMS_PLUGIN} +# see if we can run this plugin from mozilla .. +USE_WEBPLUGINS= webkit-gtk3 WEBPLUGINS_FILES=librhythmbox-itms-detection-plugin.so .include "${PORTSDIR}/www/firefox/Makefile.webplugins" @@ -141,8 +135,8 @@ CONFIGURE_ARGS+=--disable-browser-plugin PLIST_SUB+= ITMS_PLUGIN="@comment " .endif -.if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 +.if ${PORT_OPTIONS:MWEBKIT} +LIB_DEPENDS+= webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 CONFIGURE_ARGS+=--with-webkit PLIST_SUB+= WEBKIT="" .else diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 4e6a507f9..73764e674 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/databases/evolution-data-server/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 @@ -22,8 +22,7 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ USE_BZIP2= yes USE_GMAKE= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix pkgconfig USE_GNOME= gnomeprefix intlhack ltverhack ltasneededhack gconf2 \ libxml2 USE_OPENLDAP= yes diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile index 2110b0fac..5feae1aea 100644 --- a/databases/evolution-data-server3/Makefile +++ b/databases/evolution-data-server3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/databases/evolution-data-server3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-data-server PORTVERSION= 3.4.4 @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ oauth:${PORTSDIR}/net/liboauth \ - goa-1.0:${PORTSDIR}/net/gnome-online-accounts \ + goa-1:${PORTSDIR}/net/gnome-online-accounts \ gdata.13:${PORTSDIR}/devel/libgdata \ ical:${PORTSDIR}/devel/libical \ nss3:${PORTSDIR}/security/nss \ @@ -30,8 +30,7 @@ CONFLICTS= evolution-data-server-2.[0-9]* LATEST_LINK= evolution-data-server3 USE_XZ= yes USE_GMAKE= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix pkgconfig USE_GNOME= gnomeprefix intlhack ltverhack ltasneededhack gconf2 \ libxml2 gtk30 USE_OPENLDAP= yes diff --git a/databases/glom/Makefile b/databases/glom/Makefile index 906fcf51f..fa57ac3cc 100644 --- a/databases/glom/Makefile +++ b/databases/glom/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: glom -# Date created: 24 April, 2005 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/glom/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= glom PORTVERSION= 1.20.6 @@ -17,21 +13,21 @@ COMMENT= GNOME database designer and user interface BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-5.0.pc:${PORTSDIR}/databases/libgda5-postgresql -LIB_DEPENDS= gdamm-5.0.13:${PORTSDIR}/databases/libgdamm5 \ - boost_python.4:${PORTSDIR}/devel/boost-python-libs \ - gtksourceviewmm-3.0.0:${PORTSDIR}/x11-toolkits/gtksourceviewmm3 \ - epc-1.0.3:${PORTSDIR}/www/libepc \ - goocanvasmm-2.0.6:${PORTSDIR}/graphics/goocanvasmm2 \ - evview3.3:${PORTSDIR}/graphics/evince3 +LIB_DEPENDS= gdamm-5.0:${PORTSDIR}/databases/libgdamm5 \ + boost_python:${PORTSDIR}/devel/boost-python-libs \ + gtksourceviewmm-3.0:${PORTSDIR}/x11-toolkits/gtksourceviewmm3 \ + epc-1.0:${PORTSDIR}/www/libepc \ + goocanvasmm-2.0:${PORTSDIR}/graphics/goocanvasmm2 \ + evview3:${PORTSDIR}/graphics/evince3 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-5.0.pc:${PORTSDIR}/databases/libgda5-postgresql USE_XZ= yes USE_PYTHON= yes GNU_CONFIGURE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig shared-mime-info USE_GMAKE= yes -USE_GNOME= gnomedocutils gnomehack gnomeprefix intltool pygobject3 libxml2 +USE_GNOME= gnomedocutils gnomeprefix intltool pygobject3 libxml2 USE_LDCONFIG= yes USE_PGSQL= yes INSTALLS_OMF= yes @@ -62,7 +58,4 @@ post-patch: ${WRKSRC}/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc \ ${WRKSRC}/glom/main.cc -post-install: - @-update-mime-database ${PREFIX}/share/mime - .include <bsd.port.mk> diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist index 70710c26e..129b2382a 100644 --- a/databases/glom/pkg-plist +++ b/databases/glom/pkg-plist @@ -330,8 +330,6 @@ share/omf/glom/glom-sv.omf @dirrm %%DATADIR%%/glade/developer @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @dirrmtry share/applications @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile index ede207e21..7f59e436f 100644 --- a/databases/libgda5-bdb/Makefile +++ b/databases/libgda5-bdb/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: libgda4-bdb -# Date created: 28 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5-jdbc/Makefile b/databases/libgda5-jdbc/Makefile index e7d6edcf1..6258b2fd9 100644 --- a/databases/libgda5-jdbc/Makefile +++ b/databases/libgda5-jdbc/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: libgda4-java -# Date created: 10 Mar 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5-ldap/Makefile b/databases/libgda5-ldap/Makefile index a92afa974..b22fb57b4 100644 --- a/databases/libgda5-ldap/Makefile +++ b/databases/libgda5-ldap/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgda2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgda5-ldap/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5-mdb/Makefile b/databases/libgda5-mdb/Makefile index 02084376e..0f791017f 100644 --- a/databases/libgda5-mdb/Makefile +++ b/databases/libgda5-mdb/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgda2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgda5-mdb/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5-mysql/Makefile b/databases/libgda5-mysql/Makefile index 297d1bc52..47ed70a32 100644 --- a/databases/libgda5-mysql/Makefile +++ b/databases/libgda5-mysql/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgda2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgda5-mysql/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5-postgresql/Makefile b/databases/libgda5-postgresql/Makefile index 304875855..83cab0dcd 100644 --- a/databases/libgda5-postgresql/Makefile +++ b/databases/libgda5-postgresql/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgda2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgda5-postgresql/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION?= 0 CATEGORIES= databases gnome diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index cb46dbf8d..12f813523 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgda2 -# Date created: 02 June 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgda5/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgda PORTVERSION?= 5.0.2 @@ -23,15 +19,15 @@ LIBGDA5_SLAVE?= no .if !defined(REFERENCE_PORT) #BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \ - soup-2.4.1:${PORTSDIR}/devel/libsoup \ - json-glib-1.0.0:${PORTSDIR}/devel/json-glib +LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ + soup-2.4:${PORTSDIR}/devel/libsoup \ + json-glib-1.0:${PORTSDIR}/devel/json-glib #RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection USE_AUTOTOOLS= libtool -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack +USE_GNOME= gnomeprefix glib20 libxslt intlhack referencehack USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes @@ -91,7 +87,7 @@ CONFIGURE_ARGS+= --without-postgres # MDB (MS Access) .if ${LIBGDA5_SLAVE}=="mdb" -LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools +LIB_DEPENDS+= mdbsql:${PORTSDIR}/databases/mdbtools CONFIGURE_ARGS+= --with-mdb=${LOCALBASE} .else CONFIGURE_ARGS+= --without-mdb @@ -146,11 +142,5 @@ post-install: ${PREFIX}/libdata/pkgconfig/ .endif -.include <bsd.port.pre.mk> - -.if ${LIBGDA5_SLAVE}=="jdbc" && ${OSVERSION} < 800000 -BROKEN= does not compile on 7.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile index a4b2ea820..6b0dab333 100644 --- a/databases/libgdamm5/Makefile +++ b/databases/libgdamm5/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libglademm -# Date created: 1 Oct 2003 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# +# Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/databases/libgdamm5/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgdamm PORTVERSION= 4.99.6 @@ -15,22 +11,21 @@ DIST_SUBDIR= gnome3 MAINTAINER= bland@FreeBSD.org COMMENT= C++ wrapper for libgda5 library -LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack libgda5 +USE_GNOME= gnomehack libgda5 glibmm GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static --disable-documentation -OPTIONS= BDB "Build the Berkely DB bindings also" off +OPTIONS_DEFINE= BDB .include <bsd.port.options.mk> -.if defined(WITH_BDB) || exists(${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc) +.if ${PORT_OPTIONS:MBDB} || exists(${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc) BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:${PORTSDIR}/databases/libgda5-bdb RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libgda-bdb-5.0.pc:${PORTSDIR}/databases/libgda5-bdb PLIST_SUB+= BDB="" diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile index 0d6069347..341b55fee 100644 --- a/deskutils/baobab/Makefile +++ b/deskutils/baobab/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/baobab/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= baobab PORTVERSION= 3.4.1 @@ -21,9 +17,9 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libxml2 gtk30 +USE_GNOME= gnomeprefix intlhack libxml2 gtk30 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile index 7688b5b76..3010e987d 100644 --- a/deskutils/gnome-contacts/Makefile +++ b/deskutils/gnome-contacts/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: gnome-contacts -# Date Created: 17 Okt 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= gnome-contacts PORTVERSION= 3.4.1 @@ -14,14 +11,14 @@ MAINTAINER= kwm@FreeBSD.org COMMENT= Contacts manager for gnome BUILD_DEPENDS= vala>=0.14.0:${PORTSDIR}/lang/vala -LIB_DEPENDS= goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \ +LIB_DEPENDS= goa-1.0:${PORTSDIR}/net/gnome-online-accounts \ folks.25:${PORTSDIR}/net-im/folks \ - notify.4:${PORTSDIR}/devel/libnotify + notify:${PORTSDIR}/devel/libnotify USE_XZ= yes -USE_GNOME= gnomehack intlhack gtk30 gnomedesktop3 evolutiondataserver3 +USE_GNOME= intlhack gtk30 gnomedesktop3 evolutiondataserver3 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_PERL5= yes GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile index 660a677bc..2220711f9 100644 --- a/deskutils/gnome-dictionary/Makefile +++ b/deskutils/gnome-dictionary/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gnome-dictionary/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-dictionary PORTVERSION= 3.4.0 @@ -20,12 +16,12 @@ BUILD_DEPENDS= gtkdoc-check:${PORTSDIR}/textproc/gtk-doc CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils gtk30 +USE_GNOME= gnomeprefix intlhack gnomedocutils gtk30 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile index d2513248f..17d811400 100644 --- a/deskutils/gnome-font-viewer/Makefile +++ b/deskutils/gnome-font-viewer/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= gnome-font-viewer PORTVERSION= 3.4.0 @@ -15,16 +11,16 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 font viewer utility -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 +USE_GNOME= gnomeprefix intlhack gtk30 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile index 50c58235a..170d64af6 100644 --- a/deskutils/gnome-screenshot/Makefile +++ b/deskutils/gnome-screenshot/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= gnome-screenshot PORTVERSION= 3.4.1 @@ -20,9 +16,9 @@ LIB_DEPENDS= canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 +USE_GNOME= gnomeprefix intlhack gtk30 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile index 28e388dad..e0353be62 100644 --- a/deskutils/gnome-search-tool/Makefile +++ b/deskutils/gnome-search-tool/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gnome-search-tool/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-search-tool PORTVERSION= 3.4.0 @@ -18,12 +14,12 @@ COMMENT= GNOME 3 file search utilities CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes USE_GMAKE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gconf2 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gconf2 gnomedocutils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile index 634bf93ab..f8c25fa66 100644 --- a/deskutils/gnome-system-log/Makefile +++ b/deskutils/gnome-system-log/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gnome-system-log/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-system-log PORTVERSION= 3.4.1 @@ -18,11 +14,11 @@ COMMENT= GNOME 3 system log viewer CONFLICTS= gnome-utils-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gnomedocutils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile index 2b744ade5..e391c7319 100644 --- a/deskutils/gnome-tweak-tool/Makefile +++ b/deskutils/gnome-tweak-tool/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/deskutils/gnome-tweak-tool/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-tweak-tool PORTVERSION= 3.4.0.1 @@ -15,9 +15,9 @@ RUN_DEPENDS= gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-deskto USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gconf2 pygobject3 +USE_GNOME= gnomeprefix gconf2 pygobject3 USE_PYTHON= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index a72c998ef..3d426d1c6 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeutils2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gnome-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-utils PORTVERSION= 2.32.0 @@ -17,20 +13,20 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 support utilities -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \ + canberra-gtk:${PORTSDIR}/audio/libcanberra CONFLICTS= baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \ gnome-font-viewer-3.[0-9]* gnome-screenshot-3.[0-9]* \ gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes USE_GMAKE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack +USE_GNOME= gnomeprefix intlhack gnomepanel ltverhack USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --enable-maintainer-flags=no CPPFLAGS+= -I${LOCALBASE}/include diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index 047f0d7c0..363a88b91 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/deskutils/gnote/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnote PORTVERSION= 0.8.3 @@ -18,9 +18,9 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ USE_GMAKE= yes USE_XZ= yes -USE_GNOME= gnomehack gnomeprefix gtk30 intltool libxml2 libxslt \ - ltverhack desktopfileutils gnomedocutils gtkmm30 -USE_GETTEXT= yes +USE_GNOME= gnomeprefix gtk30 intltool libxml2 libxslt \ + ltverhack gnomedocutils gtkmm30 +USES= gettext pathfix pkgconfig desktop-file-utils GLIB_SCHEMAS= org.gnome.gnote.gschema.xml USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes @@ -53,7 +53,6 @@ post-patch: ${WRKSRC}/configure post-install: - @-update-desktop-database .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${DOCS} diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist index 7d19f9d62..14de9825f 100644 --- a/deskutils/gnote/pkg-plist +++ b/deskutils/gnote/pkg-plist @@ -556,5 +556,3 @@ share/locale/zh_CN/LC_MESSAGES/gnote.mo @dirrmtry lib/gnote/addins/%%VERSION%% @dirrmtry lib/gnote/addins @dirrmtry lib/gnote -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index b501a5660..7992bd01a 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gucharmap -# Date created: 02 Mar 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gucharmap/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gucharmap PORTVERSION= 2.32.1 @@ -16,14 +12,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A Unicode/ISO10646 character map and font viewer -LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian +LIB_DEPENDS= rarian:${PORTSDIR}/textproc/rarian CONFLICTS= gucharmap-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 +USE_GNOME= gnomeprefix intlhack gtk20 gnomedocutils gconf2 GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes diff --git a/deskutils/gucharmap3/Makefile b/deskutils/gucharmap3/Makefile index b8ccfa34e..81ccd0c57 100644 --- a/deskutils/gucharmap3/Makefile +++ b/deskutils/gucharmap3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gucharmap -# Date created: 02 Mar 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/gucharmap3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gucharmap PORTVERSION= 3.4.1.1 @@ -19,9 +15,9 @@ CONFLICTS= gucharmap-2.[0-9]* LATEST_LINK= gucharmap3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk30 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index 34d81f142..9b5fcc763 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: notification-daemon -# Date created: 2005-08-06 -# Whom: Andreas Kohn <andreas@syndrom23.de> -# +# Created by: Andreas Kohn <andreas@syndrom23.de> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/deskutils/notification-daemon/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= notification-daemon PORTVERSION= 0.7.6 @@ -17,13 +13,13 @@ COMMENT= Send small notifications to your desktop LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 USE_XZ= yes -USE_GNOME= gnomehack gnomeprefix intlhack gtk30 +USE_GNOME= gnomeprefix intlhack gtk30 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XORG= x11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 4c9bc9daa..fb4a1f34c 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -17,12 +17,10 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USES= pathfix USE_GNOME= libidl ltverhack referencehack -USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/anjuta-extras3/Makefile b/devel/anjuta-extras3/Makefile index b40d1dca3..3408b6d5f 100644 --- a/devel/anjuta-extras3/Makefile +++ b/devel/anjuta-extras3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: anjuta-extras -# Date created: 8 May 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= anjuta-extras PORTVERSION= 3.4.0 @@ -17,7 +13,7 @@ COMMENT= Extra anjuta 3 plugins LIB_DEPENDS= anjuta-3:${PORTSDIR}/devel/anjuta3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/anjuta3/Makefile b/devel/anjuta3/Makefile index 310907e1b..6805a4a60 100644 --- a/devel/anjuta3/Makefile +++ b/devel/anjuta3/Makefile @@ -1,6 +1,6 @@ # Created by: Dmitry Sivachenko <demon@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/anjuta3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= anjuta PORTVERSION= 3.4.3 @@ -28,9 +28,8 @@ CONFLICTS= anjuta-2.[0-9]* LATEST_LINK= anjuta3 USE_XZ= yes -USES= bison pathfix +USES= bison pathfix gettext pkgconfig shared-mime-info USE_GMAKE= yes -USE_GETTEXT= yes INSTALLS_ICONS= yes USE_PERL5= yes USE_PYTHON= yes @@ -120,7 +119,4 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ ${WRKSRC}/libanjuta/anjuta-utils.c -post-install: - @update-mime-database ${PREFIX}/share/mime - .include <bsd.port.mk> diff --git a/devel/anjuta3/pkg-plist b/devel/anjuta3/pkg-plist index 9d28c69d5..384105e5c 100644 --- a/devel/anjuta3/pkg-plist +++ b/devel/anjuta3/pkg-plist @@ -2252,5 +2252,3 @@ share/pixmaps/anjuta/anjuta-preferences-general-48.png @dirrm include/libanjuta-3.0/libanjuta/interfaces @dirrm include/libanjuta-3.0/libanjuta @dirrm include/libanjuta-3.0 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index aaebf695a..13ace6d7c 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -12,9 +12,8 @@ COMMENT= A couple of command line utilities for working with desktop entries USE_GNOME= glib20 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pkgconfig USE_GMAKE= yes -USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-lispdir CONFIGURE_ENV= EMACS="no" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 365f22ba9..02d65ced0 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: devhelp -# Date created: 29 May 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/devhelp/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= devhelp PORTVERSION= 2.32.0 @@ -16,16 +13,16 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Developer help browser for GNOME 2 -LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique CONFLICTS= devhelp-3.[0-9]* USE_BZIP2= yes USE_XORG= x11 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck +USE_GNOME= intlhack gnomeprefix libgnomeui libwnck USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -34,11 +31,12 @@ GCONF_SCHEMAS= devhelp.schemas CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -OPTIONS= GEDIT "Enable GEdit plug-in support" off +OPTIONS_DEFINE= GEDIT +GEDIT_DESC= GEdit plug-in support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GEDIT) +.if ${PORT_OPTIONS:MGEDIT} BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit PLIST_SUB+= GEDIT="" @@ -47,11 +45,11 @@ PLIST_SUB+= GEDIT="@comment " .endif post-patch: -.if defined(WITHOUT_GEDIT) +.if ! ${PORT_OPTIONS:MGEDIT} @${REINPLACE_CMD} -e 's|gedit-plugin||' \ ${WRKSRC}/misc/Makefile.in @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_SINGLE_INCLUDES||g' \ ${WRKSRC}/src/Makefile.in .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/devhelp3/Makefile b/devel/devhelp3/Makefile index 54d48d5b3..7a3c8b013 100644 --- a/devel/devhelp3/Makefile +++ b/devel/devhelp3/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: devhelp -# Date created: 29 May 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/devhelp3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= devhelp PORTVERSION= 3.4.1 @@ -14,16 +11,16 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Developer help browser for GNOME 3 -LIB_DEPENDS= webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 +LIB_DEPENDS= webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 CONFLICTS= devhelp-2.[0-9]* LATEST_LINK= devhelp3 USE_XZ= yes USE_XORG= x11 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gtk30 gconf2 +USE_GNOME= intlhack gnomeprefix gtk30 gconf2 USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 49155aa97..e580327e4 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -13,10 +13,8 @@ COMMENT?= A file and directory monitoring system USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GETTEXT= yes -USES= pathfix +USES= gettext pathfix pkgconfig USE_GNOME?= glib20 -USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index aa0977e98..fbd07c154 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/gconf2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gconf2 PORTVERSION= 3.2.6 @@ -25,8 +25,8 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ polkit-gobject-1:${PORTSDIR}/sysutils/polkit USE_GMAKE= yes -USE_GETTEXT= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ +USES= gettext pathfix pkgconfig +USE_GNOME= gnomehier orbit2 gtk20 libxml2 ltverhack \ referencehack intlhack dconf USE_LDCONFIG= yes USE_AUTOTOOLS= libtool @@ -40,8 +40,6 @@ MAN1= gconftool-2.1 gsettings-data-convert.1 \ OPTIONS_DEFINE= LDAP -#OPTIONS= LDAP "Enable LDAP support" off - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLDAP} diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 54cf59824..4fd33eadb 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: glade3 -# Date created: Sun May 22 17:22:53 CEST 2005 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/glade/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= glade PORTVERSION= 3.12.2 @@ -22,9 +18,9 @@ CONFLICTS= glade3-3.* INSTALLS_ICONS= yes USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gtk30 gnomeprefix gnomehack ltverhack gnomedocutils +USE_GNOME= gtk30 gnomeprefix ltverhack gnomedocutils WANT_GNOME= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool @@ -33,11 +29,12 @@ LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/gladeui-2 -OPTIONS= PYTHON "Enable python widget support" on +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT=PYTHON .include <bsd.port.options.mk> -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes USE_GNOME+= pygobject3 PLIST_SUB+= PYTHON:="" @@ -47,7 +44,4 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON:="@comment " .endif -post-install: - @-update-desktop-database - .include <bsd.port.mk> diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index 2f727f99e..9e1c15635 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: glade3 -# Date created: Sun May 22 17:22:53 CEST 2005 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/glade3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= glade3 PORTVERSION= 3.8.2 @@ -21,10 +17,9 @@ LATEST_LINK= glade3 INSTALLS_ICONS= yes USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gtk20 libxml2 gnomeprefix gnomehack \ - gnomedocutils desktopfileutils ltverhack:10 +USE_GNOME= gtk20 libxml2 gnomeprefix gnomedocutils ltverhack:10 WANT_GNOME= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool @@ -33,12 +28,13 @@ LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/gladeui -OPTIONS= GNOME "Enable GNOME UI widget support" off \ - PYTHON "Enable python widget support" on +OPTIONS_DEFINE= GNOME PYTHON +OPTIONS_DEFAULT=PYTHON +GNOME_DESC= GNOME UI widget support .include <bsd.port.options.mk> -.if defined(WITH_GNOME) +.if ${PORT_OPTIONS:MGNOME} USE_GNOME+= libgnomeui CONFIGURE_ARGS+=--enable-gnome PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gnome @@ -48,7 +44,7 @@ CONFIGURE_ARGS+=--disable-gnome PLIST_SUB+= GNOME:="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes USE_GNOME+= pygtk2 PLIST_SUB+= PYTHON:="" @@ -60,6 +56,5 @@ PLIST_SUB+= PYTHON:="@comment " post-install: ${MKDIR} ${PREFIX}/lib/glade3/bindings - @-update-desktop-database .include <bsd.port.mk> diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist index f38e05568..c60fa5b37 100644 --- a/devel/glade3/pkg-plist +++ b/devel/glade3/pkg-plist @@ -622,8 +622,6 @@ share/omf/glade3/glade3-zh_CN.omf @dirrm lib/glade3 @dirrm include/libgladeui-1.0/gladeui @dirrm include/libgladeui-1.0 -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 1e00df2ff..96bb3183f 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -23,12 +23,9 @@ PORTSCOUT= limitw:1,even LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ ffi:${PORTSDIR}/devel/libffi -USE_GETTEXT= yes -USE_ICONV= yes +USES= gettext iconv pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_PKGCONFIG= build -USES= pathfix USE_GNOME= ltverhack USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index a2eb4fe6c..7fa33e2c4 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -22,10 +22,8 @@ PLIST_SUB= VERSION="2.4" API_VERSION="2.4" BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes -USE_GETTEXT= yes -USES= pathfix +USES= gettext pathfix pkgconfig USE_GNOME= glib20 ltverhack libsigc++20 -USE_PKGCONFIG= build USE_PERL5= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 7f88e10bb..7366af636 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -15,14 +15,12 @@ COMMENT= Generate interface introspection data for GObject libraries BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi -USES= bison pathfix +USES= bison pathfix pkgconfig gettext USE_XZ= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehier glib20 ltverhack -USE_PKGCONFIG= build USE_PYTHON= -2.7 -USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index aed6e2d18..b71f928c4 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/goffice/Makefile 18385 2013-04-22 12:56:25Z kwm $ PORTNAME= goffice PORTVERSION= 0.10.1 @@ -15,14 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_XZ= yes USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomeprefix intlhack gtk30 libgsf ltverhack -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-lasem=no --with-config-backend=gsettings + PLIST_SUB= VERSION=${PORTVERSION} SHORT_VER=${SHORT_VER} SHORT_VER=0.10 diff --git a/devel/goffice08/Makefile b/devel/goffice08/Makefile index 4bf0d68a6..761ab229e 100644 --- a/devel/goffice08/Makefile +++ b/devel/goffice08/Makefile @@ -19,12 +19,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack -USE_GETTEXT= yes +USE_GNOME= gnomeprefix intlhack gtk20 libgsf ltverhack +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib + PLIST_SUB= VERSION=${PORTVERSION} \ SHORT_VER=0.8 diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index 72537feca..17dc5b0a7 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gsettings-desktop-schemas -# Date created: 14 Aug 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gsettings-desktop-schemas PORTVERSION= 3.4.2 @@ -22,11 +18,10 @@ RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11 g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_PERL5_BUILD= yes -USE_GNOME= gnomehack intltool glib20 -USE_PKGCONFIG= build +USE_GNOME= intltool glib20 GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 12e643ae2..d75596378 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtranslator -# Date created: 16 September 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/gtranslator/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gtranslator PORTVERSION= 2.91.5 @@ -26,10 +22,9 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas USE_XZ= yes -USE_GNOME= gnomehack intlhack gnomeprefix gtk30 libgda4 \ - gtksourceview3 libxml2 +USE_GNOME= intlhack gnomeprefix gtk30 libgda4 gtksourceview3 libxml2 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_PYTHON= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes @@ -56,6 +51,7 @@ DICT_DESC= Build dictionary plugin .if ${PORT_OPTIONS:MDICT} BUILD_DEPENDS+= gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary LIB_DEPENDS+= gdict-1.0:${PORTSDIR}/deskutils/gnome-dictionary +RUN_DEPENDS+= gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary GLIB_SCHEMAS+= org.gnome.gtranslator.plugins.dictionary.gschema.xml CONFIGURE_ARGS+=--with-dictionary PLIST_SUB+= DICT="" diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 9cf721ace..a72fd18a8 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -18,14 +18,12 @@ USE_BZIP2= yes LIB_DEPENDS= popt:${PORTSDIR}/devel/popt -USES= bison pathfix USE_GMAKE= yes -USE_GETTEXT= yes +USES= bison gettext pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5= yes USE_GNOME= intlhack libxml2 orbit2 referencehack -USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index 28dc4c005..c829acd68 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgdata -# Date created: 9 May 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/libgdata/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgdata PORTVERSION= 0.12.0 @@ -24,12 +20,11 @@ CONFLICTS= libgdata-0.6.* USE_XZ= yes USE_LDCONFIG= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intltool ltverhack glib20 -USE_PKGCONFIG= build +USE_GNOME= gnomeprefix intltool ltverhack glib20 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile index 5fd7b3104..33c6f391c 100644 --- a/devel/libgdata06/Makefile +++ b/devel/libgdata06/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgdata -# Date created: 9 May 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/libgdata06/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgdata PORTVERSION= 0.6.6 @@ -16,20 +12,20 @@ MAINTAINER= kwm@FreeBSD.org COMMENT= GLib based implimentation of the GData protocol BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome +LIB_DEPENDS= soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome CONFLICTS= libgdata-0.10.* LATEST_LINK= libgdata06 USE_BZIP2= yes USE_LDCONFIG= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack intltool ltverhack glib20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ - LDFLAGS="-L${LOCALBASE}/lib" +USE_GNOME= intltool ltverhack glib20 +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" .include <bsd.port.mk> diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index f3d899f97..ce63c4605 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -15,10 +15,9 @@ BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_XZ= yes USE_GMAKE= yes +USES= gettext pathfix pkgconfig USE_GETTEXT= yes USE_LDCONFIG= yes -USE_PKGCONFIG= build -USES= pathfix USE_GNOME= gnomeprefix glib20 libxml2 ltverhack intlhack USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 3ee6e3cf1..baad2850b 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/libgtop/Makefile 17279 2013-04-06 09:33:19Z kwm $ PORTNAME= libgtop PORTVERSION= 2.28.4 @@ -14,9 +14,8 @@ COMMENT= GNOME 2 top library USE_XZ= yes USE_PERL5_BUILD=yes USE_XORG= xau -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomeprefix glib20 ltverhack intlhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index 9f5626ab1..f4c4e151b 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libnotify -# Date created: 2005-08-06 -# Whom: Andreas Kohn <andreas@syndrom23.de> -# +# Created by: Andreas Kohn <andreas@syndrom23.de> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/libnotify/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libnotify PORTVERSION= 0.7.5 @@ -21,8 +17,8 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_XZ= yes -USE_GNOME= gnomehack intlhack glib20 gtk20 ltverhack -USE_GETTEXT= yes +USE_GNOME= intlhack glib20 gtk20 ltverhack +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index a27359870..be1cb96cd 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: liboobs -# Date created: 2006-06-06 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/liboobs/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= liboobs PORTVERSION= 3.0.0 @@ -16,14 +12,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Wrapping library to the System Tools Backends BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + hal:${PORTSDIR}/sysutils/hal RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack glib20 +USES= pathfix +USE_GNOME= gnomeprefix glib20 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-hal CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 5dddac310..6aa79a239 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -17,10 +17,9 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ USE_XZ= yes USE_PYTHON= 2.5+ USE_LDCONFIG= yes -USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -USES= pathfix +USES= pathfix gettext pkgconfig USE_GNOME= gtk30 ltverhack INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 5a6946dc1..8898bbc10 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -20,8 +20,7 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) -USE_GETTEXT= yes -USES= pathfix +USES= pathfix gettext USE_GNOME= gnomehier glib20 libxml2 ltverhack referencehack intltool USE_SQLITE= 3 USE_LDCONFIG= yes diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile index 1fb06c0cc..703a8d86d 100644 --- a/devel/mm-common/Makefile +++ b/devel/mm-common/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: mm-common -# Date Created: 27 Aug 2009 -# Whom: Koop Mast<kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/mm-common/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= mm-common PORTVERSION= 0.9.5 @@ -14,9 +10,9 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Common build infrastructure for the GNOME C++ binding libraries -LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl -USE_GNOME= gnomehack +USES= pathfix USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index 59c294fd5..3e4249d23 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: py-dbus -# Date Created: 25 July 2004 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= dbus PORTVERSION= 1.1.1 @@ -18,8 +14,7 @@ COMMENT= Python bindings for the D-BUS messaging system LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_GETTEXT= yes -USE_GNOME= gnomehack +USES= gettext pathfix pkgconfig USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool @@ -30,9 +25,9 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if exists(${LOCALBASE}/bin/rst2html) && !defined(NOPORTDOCS) +.if exists(${LOCALBASE}/bin/rst2html) && ${PORT_OPTIONS:MDOCS} PLIST_SUB+= HTML="" .else CONFIGURE_ARGS+=--disable-html-docs @@ -40,16 +35,16 @@ PLIST_SUB+= HTML="@comment " .endif post-patch: -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ s|PYTHON install-nodist_docDATA|PYTHON|g' \ ${WRKSRC}/Makefile.in .endif post-install: -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} && \ ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile index b9716bc3b..e2766f869 100644 --- a/devel/regexxer/Makefile +++ b/devel/regexxer/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: regexxer -# Date created: 15 February 2003 -# Whom: Rui Lopes <rui@ruilopes.com> -# +# Created by: Rui Lopes <rui@ruilopes.com> # $FreeBSD$ -# PORTNAME= regexxer PORTVERSION= 0.10 @@ -13,14 +9,11 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= An interactive tool for performing search and replace operations -LIB_DEPENDS= gtkmm-3.0.1:${PORTSDIR}/x11-toolkits/gtkmm30 \ - gtksourceviewmm-3.0.0:${PORTSDIR}/x11-toolkits/gtksourceviewmm3 - -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intltool intlhack +USE_GNOME= gnomeprefix intltool intlhack gtkmm30 gtksourceviewmm3 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile index e8ad27c18..3e8037921 100644 --- a/devel/seed3/Makefile +++ b/devel/seed3/Makefile @@ -1,6 +1,6 @@ # Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/devel/seed3/Makefile 17268 2013-04-01 05:13:11Z marcus $ # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. @@ -25,8 +25,8 @@ CONFLICTS= seed-2.[0-9]* LATEST_LINK= seed3 USE_XZ= yes GNU_CONFIGURE= yes -USE_GETTEXT= yes -USE_GNOME= gnomehack gtk30 intltool libxml2 +USES= gettext pathfix pkgconfig +USE_GNOME= gtk30 intltool libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_SQLITE= yes @@ -38,7 +38,7 @@ DATADIR= share/seed-gtk3 MAN1= seed.1 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ @@ -52,7 +52,7 @@ post-patch: # @${REINPLACE_CMD} -e 's|examples||g' \ # ${WRKSRC}/Makefile.in #.endif -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \ ${WRKSRC}/Makefile.in .endif @@ -66,4 +66,4 @@ pre-build: post-build: ${CP} ${WRKSRC}/extensions/Seed.js.sav ${WRKSRC}/extensions/Seed.js -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index a27f900dc..a9ce9c9d6 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gedit-plugins -# Date created: 19 September 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/gedit-plugins/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gedit-plugins PORTVERSION= 2.32.0 @@ -26,9 +22,9 @@ CONFLICTS= gedit-plugins-3.[0-9]* USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gnomeprefix intlhack gnomevfs2 +USE_GNOME= gnomeprefix intlhack gnomevfs2 WANT_GNOME= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -36,16 +32,17 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas \ gedit-drawspaces.schemas -OPTIONS= PYTHON "Build plugins that depend on python" off +OPTIONS_DEFINE= PYTHON +PYTHON_DESC= Build python plugins .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME WITH_GNOME= yes .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON) +.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" USE_GNOME+= pygtksourceview diff --git a/editors/gedit-plugins3/Makefile b/editors/gedit-plugins3/Makefile index b4b416a4f..be4bb7f33 100644 --- a/editors/gedit-plugins3/Makefile +++ b/editors/gedit-plugins3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gedit-plugins -# Date created: 19 September 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/gedit-plugins3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gedit-plugins PORTVERSION= 3.4.0 @@ -16,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Plugins for GEdit 3 BUILD_DEPENDS= gedit>=${GEDITVER}:${PORTSDIR}/editors/gedit3 -LIB_DEPENDS= peas-1.0.0:${PORTSDIR}/devel/libpeas +LIB_DEPENDS= peas-1.0:${PORTSDIR}/devel/libpeas RUN_DEPENDS= gedit>=${GEDITVER}:${PORTSDIR}/editors/gedit3 CONFLICTS= gedit-plugins-2.[0-9]* @@ -26,9 +22,9 @@ LATEST_LINK= gedit-plugins3 USE_LDCONFIG= yes USE_XZ= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gnomeprefix intlhack gtk30 gtksourceview3 +USE_GNOME= gnomeprefix intlhack gtk30 gtksourceview3 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 3c95490bc..3f3bf6199 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gedit2 -# Date created: 14 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/gedit/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gedit PORTVERSION= 2.30.4 @@ -17,21 +13,21 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A small but powerful text editor for GNOME 2 Desktop Environment BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes CONFLICTS= gedit-3.[0-9]* USE_XORG= sm USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils INSTALLS_OMF= yes USE_LDCONFIG= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \ - desktopfileutils gnomedocutils ltasneededhack +USE_GNOME= gnomeprefix intlhack gconf2 gtksourceview2 \ + gnomedocutils ltasneededhack WANT_GNOME= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -45,7 +41,7 @@ GCONF_SCHEMAS= gedit.schemas gedit-file-browser.schemas WITH_GNOME= yes .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${HAVE_GNOME:Mpygtksourceview}!="" USE_PYTHON= yes @@ -64,7 +60,4 @@ PLIST_SUB+= PYTHON="@comment " # ${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff} #.endfor -post-install: - @-update-desktop-database - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index 0823a841a..820f57741 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -635,8 +635,6 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry lib/gedit-2 @dirrm include/gedit-%%VERSION%%/gedit @dirrm include/gedit-%%VERSION%% -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile index ec324e634..b7806e5f9 100644 --- a/editors/gedit3/Makefile +++ b/editors/gedit3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gedit2 -# Date created: 14 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/gedit3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gedit PORTVERSION= 3.4.2 @@ -18,9 +14,9 @@ COMMENT= A small but powerful text editor for GNOME 3 Desktop Environment BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \ itstool:${PORTSDIR}/textproc/itstool -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - peas-gtk-1.0.0:${PORTSDIR}/devel/libpeas \ - soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + peas-gtk-1.0:${PORTSDIR}/devel/libpeas \ + soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas @@ -29,13 +25,13 @@ CONFLICTS= gedit-2.[0-9]* LATEST_LINK= gedit3 USE_XORG= sm USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig USE_PYTHON= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intlhack gtksourceview3 libxml2 \ - desktopfileutils gnomedocutils pygobject3 +USE_GNOME= gnomeprefix intlhack gtksourceview3 libxml2 \ + gnomedocutils pygobject3 CONFIGURE_ARGS= --disable-updater CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -51,7 +47,4 @@ GLIB_SCHEMAS= org.gnome.gedit.enums.xml \ org.gnome.gedit.plugins.time.enums.xml \ org.gnome.gedit.plugins.time.gschema.xml -post-install: - @-update-desktop-database - .include <bsd.port.mk> diff --git a/editors/gedit3/pkg-plist b/editors/gedit3/pkg-plist index 3a5d10832..eeb3fc96c 100644 --- a/editors/gedit3/pkg-plist +++ b/editors/gedit3/pkg-plist @@ -2319,5 +2319,3 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo @dirrmtry lib/gedit @dirrm include/gedit-%%VERSION%%/gedit @dirrm include/gedit-%%VERSION%% -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index 831f77377..6fa973c28 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: ghex2 -# Date created: 15 September 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/ghex/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= ghex PORTVERSION= 2.24.0 @@ -20,9 +16,8 @@ CONFLICT= ghex-3.\* USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \ - gnomedocutils -USE_GETTEXT= yes +USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui gnomedocutils +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/editors/ghex3/Makefile b/editors/ghex3/Makefile index a06ea3bda..4c7d6da28 100644 --- a/editors/ghex3/Makefile +++ b/editors/ghex3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: ghex2 -# Date created: 15 September 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/editors/ghex3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= ghex PORTVERSION= 3.4.1 @@ -19,9 +15,9 @@ CONFLICT= ghex-2.\* USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gnomedocutils INSTALLS_OMF= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 806a496cf..184fd9c6c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomegames2 -# Date created: 08 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/games/gnome-games/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-games PORTVERSION= 2.32.1 @@ -17,21 +13,20 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= The game applications package for the GNOME 2 Desktop Environment BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile \ - clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \ - clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter +LIB_DEPENDS= guile:${PORTSDIR}/lang/guile \ + clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk \ + clutter-glx-1.0:${PORTSDIR}/graphics/clutter RUN_DEPENDS= seed:${PORTSDIR}/devel/seed CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]* USE_BZIP2= yes USE_PYTHON= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack \ - librsvg2 desktopfileutils pygnomedesktop gnomedocutils +USE_GNOME= gnomeprefix intlhack librsvg2 pygnomedesktop gnomedocutils USE_GSTREAMER= vorbis ogg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sound=gstreamer \ @@ -73,6 +68,5 @@ post-install: #.for dsc in ${DSC_FILES} # ${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T} #.endfor - @-update-desktop-database .include <bsd.port.post.mk> diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 7ead24d3c..bec415cd8 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -3169,8 +3169,6 @@ share/omf/swell-foop/swell-foop-sv.omf @dirrm %%PYTHON_SITELIBDIR%%/glchess/chess @dirrm %%PYTHON_SITELIBDIR%%/glchess @dirrm lib/gnome-games -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES diff --git a/games/gnome-games3/Makefile b/games/gnome-games3/Makefile index 2fbfed875..4d22910a8 100644 --- a/games/gnome-games3/Makefile +++ b/games/gnome-games3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomegames2 -# Date created: 08 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/games/gnome-games3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-games PORTVERSION= 3.4.2 @@ -19,10 +15,10 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools \ itstool:${PORTSDIR}/textproc/itstool \ valac:${PORTSDIR}/lang/vala -LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - clutter-gtk-1.0.0:${PORTSDIR}/graphics/clutter-gtk3 \ - clutter-1.0.0:${PORTSDIR}/graphics/clutter +LIB_DEPENDS= guile:${PORTSDIR}/lang/guile \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \ + clutter-1.0:${PORTSDIR}/graphics/clutter RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]* @@ -30,14 +26,13 @@ CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]* LATEST_LINK= gnome-games3 USE_XZ= yes USE_PYTHON= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig INSTALLS_ICONS= yes USE_GL= gl glu USE_XORG= ice x11 USE_GMAKE= yes USE_SQLITE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 pygobject3 \ - librsvg2 desktopfileutils +USE_GNOME= gnomeprefix intlhack gtk30 pygobject3 librsvg2 USE_GSTREAMER= vorbis ogg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk=3.0 --enable-games=all @@ -68,6 +63,5 @@ MAN6= glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \ post-install: ${CHGRP} games ${LOCALBASE}/share/games ${CHMOD} g=rwXs ${LOCALBASE}/share/games - @-update-desktop-database .include <bsd.port.mk> diff --git a/games/gnome-games3/pkg-plist b/games/gnome-games3/pkg-plist index 9d8b87888..2357b8f2a 100644 --- a/games/gnome-games3/pkg-plist +++ b/games/gnome-games3/pkg-plist @@ -4913,5 +4913,3 @@ share/quadrapassel/sounds/turn.ogg @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku @dirrm lib/gnome-games -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile index e6e26a4a8..dddfa95e8 100644 --- a/graphics/clutter-gtk3/Makefile +++ b/graphics/clutter-gtk3/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= clutter-1.0:${PORTSDIR}/graphics/clutter LATEST_LINK= clutter-gtk3 USE_XZ= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gtk30 ltverhack gnomeprefix +USE_GNOME= gtk30 ltverhack gnomeprefix USE_XORG= xp x11 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index d1f773ec4..6646bf82b 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -1,6 +1,6 @@ # Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/clutter/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= clutter PORTVERSION= 1.10.8 @@ -18,11 +18,9 @@ LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib \ cogl:${PORTSDIR}/graphics/cogl USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_AUTOTOOLS= libtool -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= gdkpixbuf2 ltverhack gnomeprefix atk pango USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile index 961270f95..e3f894533 100644 --- a/graphics/cogl/Makefile +++ b/graphics/cogl/Makefile @@ -1,6 +1,6 @@ # Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/cogl/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= cogl PORTVERSION= 1.10.4 @@ -18,11 +18,9 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection CONFLICTS= clutter-1.6.[0-9]* USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_AUTOTOOLS= libtool -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= gdkpixbuf2 ltverhack gnomeprefix atk pango USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile index 0bded42c0..931f6b1b9 100644 --- a/graphics/colord-gtk/Makefile +++ b/graphics/colord-gtk/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/colord-gtk/Makefile 18380 2013-04-17 13:17:26Z kwm $ PORTNAME= colord-gtk PORTVERSION= 0.1.25 @@ -17,11 +17,9 @@ LIB_DEPENDS= colord:${PORTSDIR}/graphics/colord \ lcms2:${PORTSDIR}/graphics/lcms2 USE_XZ= yes -USES= pathfix USE_GNOME= gnomehier gtk30 intlhack -USE_PKGCONFIG= build USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_SQLITE= 3 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index d56cc4951..e73ff9785 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -19,11 +19,10 @@ USERS= colord GROUPS= colord USE_XZ= yes -USES= pathfix USE_GNOME= gnomehier glib20 intlhack USE_PKGCONFIG= build USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_SQLITE= 3 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index bb1d87a05..4c5da1b9d 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eog-plugins -# Date created: 28 August 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/eog-plugins/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= eog-plugins PORTVERSION= 2.30.1 @@ -24,9 +20,9 @@ CONFLICTS= eog-plugins-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 +USE_GNOME= gnomeprefix intlhack gtk20 WANT_GNOME= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/eog-plugins3/Makefile b/graphics/eog-plugins3/Makefile index 1605a6f50..20de73252 100644 --- a/graphics/eog-plugins3/Makefile +++ b/graphics/eog-plugins3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eog-plugins -# Date created: 28 August 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/eog-plugins3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= eog-plugins PORTVERSION= 3.4.1 @@ -17,8 +13,8 @@ COMMENT= Plug-ins for the Eye of GNOME image viewer application BUILD_DEPENDS= eog>=3.4.0:${PORTSDIR}/graphics/eog3 LIB_DEPENDS= gdata.13:${PORTSDIR}/devel/libgdata \ - exif.12:${PORTSDIR}/graphics/libexif \ - peas-1.0.0:${PORTSDIR}/devel/libpeas + exif:${PORTSDIR}/graphics/libexif \ + peas-1.0:${PORTSDIR}/devel/libpeas RUN_DEPENDS= eog>=3.4.0:${PORTSDIR}/graphics/eog3 CONFLICTS= eog-plugins-2.[0-9]* @@ -26,27 +22,28 @@ CONFLICTS= eog-plugins-2.[0-9]* LATEST_LINK= eog-plugins3 USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 -USE_GETTEXT= yes +USE_GNOME= gnomeprefix intlhack gtk30 +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.eog.plugins.exif-display.gschema.xml -OPTIONS= CHAMPLAIN "Build champlain map plugin" off \ - PYTHON "Build python based plugins" on +OPTIONS_DEFINE= CHAMPLAIN PYTHON +OPTIONS_DEFAULT=PYTHON +CHAMPLAIN_DESC= Champlain map plugin .include <bsd.port.options.mk> -.if defined(WITH_CHAMPLAIN) -LIB_DEPENDS+= champlain-0.12.0:${PORTSDIR}/graphics/libchamplain +.if ${PORT_OPTIONS:MCHAMPLAIN} +LIB_DEPENDS+= champlain-0.12:${PORTSDIR}/graphics/libchamplain PLIST_SUB+= CHAMPLAIN="" .else PLIST_SUB+= CHAMPLAIN="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+=--enable-python PLIST_SUB+= PYTHON="" GLIB_SCHEMAS+= org.gnome.eog.plugins.fullscreenbg.gschema.xml \ @@ -56,7 +53,7 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif -.if defined(WITHOUT_CHAMPLAIN) +.if ! ${PORT_OPTIONS:MCHAMPLAIN} post-patch: @${REINPLACE_CMD} -e 's|champlain-gtk|disabled-champlain-gtk|g' \ ${WRKSRC}/configure diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 54b79c130..65ba0c4ba 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eog2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/eog/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= eog PORTVERSION= 2.32.1 @@ -16,20 +12,17 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The Eye Of Gnome image viewer -BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info -RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info +BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= eog-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ - gconf2 gnomedesktop +USE_GNOME= gnomeprefix intlhack librsvg2 gconf2 gnomedesktop WANT_GNOME= yes INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils shared-mime-info pkgconfig INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -37,14 +30,12 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= eog.schemas -.include <bsd.port.pre.mk> - _WITH_EXIF= no _WITH_EXEMPI= no .if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \ defined(WITH_EXIF)) -LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif PLIST_SUB+= EXIF="" _WITH_EXIF= yes .else @@ -53,7 +44,7 @@ PLIST_SUB+= EXIF="@comment " .if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \ defined(WITH_EXEMPI) -LIB_DEPENDS+= exempi.3:${PORTSDIR}/textproc/exempi +LIB_DEPENDS+= exempi:${PORTSDIR}/textproc/exempi _WITH_EXEMPI= yes .endif @@ -70,7 +61,4 @@ CONFIGURE_ARGS+=--enable-python CONFIGURE_ARGS+=--disable-python .endif -post-install: - @-update-desktop-database > /dev/null - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 92f6c69b2..e0818f7b2 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -411,8 +411,6 @@ share/omf/eog/eog-zh_TW.omf @dirrm lib/eog @dirrm include/eog-2.20/eog @dirrm include/eog-2.20 -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES diff --git a/graphics/eog3/Makefile b/graphics/eog3/Makefile index 2ad7605d7..c8743e4c4 100644 --- a/graphics/eog3/Makefile +++ b/graphics/eog3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eog2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/eog3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= eog PORTVERSION= 3.4.3 @@ -17,23 +13,20 @@ COMMENT= The Eye Of Gnome image viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info -LIB_DEPENDS= peas-gtk-1.0.0:${PORTSDIR}/devel/libpeas \ + ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas +LIB_DEPENDS= peas-gtk-1.0:${PORTSDIR}/devel/libpeas \ lcms.1:${PORTSDIR}/graphics/lcms RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info + ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas CONFLICTS= eog-2.[0-9]* LATEST_LINK= eog3 USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils gtk30 \ - gnomedesktop3 gnomedocutils +USE_GNOME= gnomeprefix intlhack librsvg2 gtk30 gnomedesktop3 gnomedocutils INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig shared-mime-info INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -76,7 +69,4 @@ PLIST_SUB+= EXIFEXEMPI="" PLIST_SUB+= EXIFEXEMPI="@comment " .endif -post-install: - @-update-desktop-database > /dev/null - .include <bsd.port.mk> diff --git a/graphics/eog3/pkg-plist b/graphics/eog3/pkg-plist index 5c4f16277..1034e04ff 100644 --- a/graphics/eog3/pkg-plist +++ b/graphics/eog3/pkg-plist @@ -1774,5 +1774,3 @@ share/locale/zu/LC_MESSAGES/eog.mo @dirrm lib/eog @dirrm include/eog-%%VERSION%%/eog @dirrm include/eog-%%VERSION%% -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index ff4da7b5f..da3dcbe4f 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evince -# Date created: 09 January 2005 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/evince/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evince PORTVERSION= 2.32.0 @@ -17,8 +13,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ - spectre.1:${PORTSDIR}/print/libspectre +LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-glib \ + spectre:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ yelp:${PORTSDIR}/x11/yelp @@ -28,11 +24,10 @@ USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils USE_GMAKE= yes INSTALLS_OMF= yes -USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ - gnomedocutils ltasneededhack gconf2 +USE_GNOME= intlhack gnomeprefix gnomedocutils ltasneededhack gconf2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -132,7 +127,4 @@ post-patch: ${WRKSRC}/help/reference/libdocument/Makefile.in \ ${WRKSRC}/help/reference/libview/Makefile.in -post-install: - @-update-desktop-database - .include <bsd.port.post.mk> diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 3ee286623..8683642eb 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -489,8 +489,6 @@ share/omf/evince/evince-zh_CN.omf @dirrm include/evince/%%VERSION%%/libdocument @dirrm include/evince/%%VERSION%% @dirrm include/evince -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES diff --git a/graphics/evince3/Makefile b/graphics/evince3/Makefile index 7aa9c48d1..450a72c72 100644 --- a/graphics/evince3/Makefile +++ b/graphics/evince3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evince -# Date created: 09 January 2005 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/evince3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evince PORTVERSION= 3.4.0 @@ -19,8 +15,8 @@ COMMENT= GNOME 3 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas -LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ - spectre.1:${PORTSDIR}/print/libspectre +LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-glib \ + spectre:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas @@ -32,11 +28,10 @@ USE_XZ= yes USE_AUTOTOOLS= libtool USE_XORG= ice INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils USE_GMAKE= yes INSTALLS_OMF= yes -USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ - gnomedocutils ltasneededhack +USE_GNOME= intlhack gnomeprefix gnomedocutils ltasneededhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -122,7 +117,4 @@ post-patch: ${WRKSRC}/help/reference/libdocument/Makefile.in \ ${WRKSRC}/help/reference/libview/Makefile.in -post-install: - @-update-desktop-database - .include <bsd.port.mk> diff --git a/graphics/evince3/pkg-plist b/graphics/evince3/pkg-plist index bf7c95407..0f70f9f54 100644 --- a/graphics/evince3/pkg-plist +++ b/graphics/evince3/pkg-plist @@ -2819,5 +2819,3 @@ share/thumbnailers/evince.thumbnailer @dirrm include/evince/%%VERSION%%/libdocument @dirrm include/evince/%%VERSION%% @dirrm include/evince -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 2460e13bd..72a1240ce 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -16,11 +16,10 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LATEST_LINK= gdk-pixbuf2 USE_XZ= yes -USE_GETTEXT= yes USE_GMAKE= yes USE_XORG= xt xi x11 USE_AUTOTOOLS= libtool -USES= pathfix +USES= pathfix pkgconfig USE_GNOME+= gnomehier glib20 ltverhack USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -36,7 +35,7 @@ OPTIONS_DEFAULT=JASPER JPEG PNG TIFF NLS .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USE_GETTEXT= yes +USES+= gettext PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile index 1fbf1e871..88049d1ee 100644 --- a/graphics/gnome-color-manager/Makefile +++ b/graphics/gnome-color-manager/Makefile @@ -1,10 +1,5 @@ -# New ports collection makefile for: gnome-color-manager -# Date Created: 31 March 2012 -# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> -# # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/gnome-color-manager/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-color-manager PORTVERSION= 3.4.2 @@ -17,17 +12,16 @@ COMMENT= A session framework for the GNOME desktop to manage color profiles BUILD_DEPENDS= docbook2man:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 -LIB_DEPENDS= lcms2.2:${PORTSDIR}/graphics/lcms2 \ - colord.1:${PORTSDIR}/graphics/colord \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= lcms2:${PORTSDIR}/graphics/lcms2 \ + colord:${PORTSDIR}/graphics/colord \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + exif:${PORTSDIR}/graphics/libexif USE_XZ= yes USE_XORG= xrandr -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 vte3 desktopfileutils \ - gnomedesktop3 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 vte3 gnomedesktop3 gnomedocutils USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils pkgconfig USE_LDCONFIG= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes @@ -53,7 +47,5 @@ post-patch: s|-Wmissing-parameter-type||g' \ ${WRKSRC}/configure -post-install: - @-update-desktop-database - .include <bsd.port.mk> + diff --git a/graphics/gnome-color-manager/pkg-plist b/graphics/gnome-color-manager/pkg-plist index d3999a6db..afc1d0da2 100644 --- a/graphics/gnome-color-manager/pkg-plist +++ b/graphics/gnome-color-manager/pkg-plist @@ -127,5 +127,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-color-manager.mo @dirrm %%DATADIR%%/figures @dirrm %%DATADIR%% @dirrmtry share/applications -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/gnome-video-effects/Makefile b/graphics/gnome-video-effects/Makefile index a7d5110ac..66add6da0 100644 --- a/graphics/gnome-video-effects/Makefile +++ b/graphics/gnome-video-effects/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: gnome-video-effects -# Date Created: 10 Mar 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= gnome-video-effects PORTVERSION= 0.3.0 @@ -14,9 +11,9 @@ MAINTAINER= kwm@FreeBSD.org COMMENT= A collection of Gstreamer effects USE_BZIP2= yes -USE_GNOME= gnomehack intlhack +USE_GNOME= intlhack USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index e190165d3..058f93c5e 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: goocanvas -# Date created: 2006-09-20 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/goocanvas/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= goocanvas PORTVERSION= 1.0.0 @@ -13,7 +10,8 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= Canvas widget for GTK+ -USE_GNOME= gtk20 gnomehack ltverhack +USS= pathfix +USE_GNOME= gtk20 ltverhack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_BZIP2= yes diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile index 5a0073b3a..0313a7f78 100644 --- a/graphics/goocanvas2/Makefile +++ b/graphics/goocanvas2/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: goocanvas -# Date created: 2006-09-20 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/goocanvas2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= goocanvas PORTVERSION= 2.0.1 @@ -16,7 +13,8 @@ COMMENT= Canvas widget for GTK+ 3 BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LATEST_LINK= goocanvas2 -USE_GNOME= gtk30 gnomehack ltverhack +USES= pathfix +USE_GNOME= gtk30 ltverhack USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile index de4946d49..00dec16cc 100644 --- a/graphics/goocanvasmm2/Makefile +++ b/graphics/goocanvasmm2/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: goocanvasmm -# Date created: 2008-08-10 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/goocanvasmm2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= goocanvasmm PORTVERSION= 1.90.8 @@ -13,10 +10,10 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= C++ bindings for the goocanvas widget for GTK -LIB_DEPENDS= gtkmm-3.0.1:${PORTSDIR}/x11-toolkits/gtkmm30 \ - goocanvas-2.0.9:${PORTSDIR}/graphics/goocanvas2 +LIB_DEPENDS= goocanvas-2.0.9:${PORTSDIR}/graphics/goocanvas2 -USE_GNOME= gnomehack ltverhack +USES= pathfix +USE_GNOME= ltverhack gtkmm30 USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-documentation diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile index 6a5a26158..49a9b406d 100644 --- a/graphics/gtk-update-icon-cache/Makefile +++ b/graphics/gtk-update-icon-cache/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/gtk-update-icon-cache/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gtk-update-icon-cache PORTVERSION= 2.24.17 @@ -26,8 +26,8 @@ USE_PERL5_BUILD=yes MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack -USE_GETTEXT= yes +USE_GNOME= atk pango gdkpixbuf2 ltverhack +USES= gettext pathfix pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 37bdbbc1d..2cd242381 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/graphics/librsvg2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= librsvg PORTVERSION= 2.36.4 @@ -13,23 +13,22 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library for parsing and rendering SVG vector-graphic files BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco +LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ + croco-0.6:${PORTSDIR}/textproc/libcroco RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehier gnomehack gnomeprefix libgsf ltverhack gtk20 +USE_GNOME= gnomehier gnomeprefix libgsf ltverhack gtk20 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-svgz \ --with-croco \ --disable-Bsymbolic \ --enable-gtk-theme -CROCO_VERSION= 0.6 MAN1= rsvg-convert.1 post-patch: diff --git a/graphics/shared-color-profiles/Makefile b/graphics/shared-color-profiles/Makefile index 3bfab5c25..3c06aee0d 100644 --- a/graphics/shared-color-profiles/Makefile +++ b/graphics/shared-color-profiles/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: shared-color-profiles -# Date created: 2012-01-25 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= shared-color-profiles PORTVERSION= 0.1.5 diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 135d8be28..b11996e74 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,6 +1,6 @@ # Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/lang/gjs/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gjs PORTVERSION= 1.32.0 @@ -14,17 +14,15 @@ COMMENT= GNOME Javascript binding BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ spidermonkey185>=1.8.5:${PORTSDIR}/lang/spidermonkey185 -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - cairo:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ mozjs185:${PORTSDIR}/lang/spidermonkey185 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_PYTHON_BUILD=yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack -USE_PKGCONFIG= build +USE_GNOME= gnomeprefix intlhack glib20 ltverhack cairo USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 577390d7f..94ec1e9f8 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -12,13 +12,11 @@ COMMENT= Programming language and compiler that converts Vala code into C code LICENSE= LGPL21 -USES= bison pathfix +USES= bison pathfix gettext pkgconfig USE_XZ= yes USE_GNOME= glib20 gnomeprefix libxslt USE_GMAKE= yes -USE_PKGCONFIG= build GNU_CONFIGURE= yes -USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile index a10104737..9d48c4a63 100644 --- a/mail/evolution-ews/Makefile +++ b/mail/evolution-ews/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-ews -# Date created: 20 Okt 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-ews/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-ews PORTVERSION= 3.4.4 @@ -16,19 +12,19 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Evolution 3 plugin to connect to Microsoft Exchange Web Services BUILD_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ - ical.44:${PORTSDIR}/devel/libical +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ + ical:${PORTSDIR}/devel/libical RUN_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 EVO_VER= 3.4.1 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_SQLITE= yes USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack +USE_GNOME= gnomeprefix intlhack ltasneededhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 6b9424a97..606c06692 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-exchange -# Date created: 28 April, 2005 -# Whom: Adam Weinberger, based off kiesel's ximian-exchange port -# +# Created by: Adam Weinberger, based off kiesel's ximian-exchange port # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-exchange/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-exchange PORTVERSION= 2.32.1 @@ -23,12 +19,12 @@ RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution CONFLICTS= evolution-exchange-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack +USE_GNOME= gnomeprefix intlhack ltasneededhack CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ diff --git a/mail/evolution-exchange3/Makefile b/mail/evolution-exchange3/Makefile index 12efe1769..a903477d6 100644 --- a/mail/evolution-exchange3/Makefile +++ b/mail/evolution-exchange3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-exchange -# Date created: 28 April, 2005 -# Whom: Adam Weinberger, based off kiesel's ximian-exchange port -# +# Created by: Adam Weinberger, based off kiesel's ximian-exchange port # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-exchange3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-exchange PORTVERSION= 3.4.4 @@ -23,12 +19,12 @@ CONFLICTS= evolution-exchange-2.[0-9]* EVO_VER= 3.4.3 LATEST_LINK= evolution-exchange3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack +USE_GNOME= gnomeprefix intlhack ltasneededhack CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ diff --git a/mail/evolution-groupwise/Makefile b/mail/evolution-groupwise/Makefile index 554f9317b..062fbc2eb 100644 --- a/mail/evolution-groupwise/Makefile +++ b/mail/evolution-groupwise/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-groupwise -# Date created: 16 Okt 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-groupwise/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-groupwise PORTVERSION= 3.4.2 @@ -20,14 +16,13 @@ RUN_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 EVO_VER= 3.4.1 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_BDB= 41 -USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack libxml2 \ - gconf2 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \ - LDFLAGS="-L${LOCALBASE}/lib" +USE_GNOME= gnomeprefix intlhack ltasneededhack libxml2 gconf2 +CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libdb=${LOCALBASE} VERSION= 3.4 diff --git a/mail/evolution-kolab/Makefile b/mail/evolution-kolab/Makefile index cefca40e8..1d75afcde 100644 --- a/mail/evolution-kolab/Makefile +++ b/mail/evolution-kolab/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-kolab -# Date created: 18 Jun 2012 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-kolab/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-kolab PORTVERSION= 3.4.4 @@ -22,12 +18,12 @@ RUN_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 EVO_VER= 3.4.1 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_SQLITE= yes MAKE_JOBS_UNSAFE=yes -USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack libxml2 gconf2 +USE_GNOME= gnomeprefix intlhack ltasneededhack libxml2 gconf2 CONFIGURE_ENV= ac_cv_path_GPERF=${LOCALBASE}/bin/gperf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile index 749459594..5ffda33a5 100644 --- a/mail/evolution-mapi/Makefile +++ b/mail/evolution-mapi/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-mapi -# Date created: 24 Mar, 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-mapi/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-mapi PORTVERSION= 0.32.2 @@ -17,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Evolution plugin to connect to Microsoft Exchange servers BUILD_DEPENDS= ${PKGFILES}:${PORTSDIR}/mail/evolution -LIB_DEPENDS= mapi.0:${PORTSDIR}/mail/libmapi +LIB_DEPENDS= mapi:${PORTSDIR}/mail/libmapi RUN_DEPENDS= ${PKGFILES}:${PORTSDIR}/mail/evolution CONFLICTS= evolution-mapi-3.[0-9]* @@ -25,7 +21,7 @@ CONFLICTS= evolution-mapi-3.[0-9]* PKGFILES= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext USE_GMAKE= yes USE_GNOME= evolutiondataserver USE_LDCONFIG= yes @@ -37,12 +33,10 @@ EVO_VERSION= 2.32 EDS_VERSION= 1.2 PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION} -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/src/libexchangemapi/Makefile.in @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/evolution-mapi3/Makefile b/mail/evolution-mapi3/Makefile index 909d37cc9..87849ed50 100644 --- a/mail/evolution-mapi3/Makefile +++ b/mail/evolution-mapi3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-mapi -# Date created: 24 Mar, 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/mail/evolution-mapi3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution-mapi PORTVERSION= 3.4.4 @@ -16,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Evolution plugin to connect to Microsoft Exchange servers BUILD_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 -LIB_DEPENDS= mapi.0:${PORTSDIR}/mail/libmapi +LIB_DEPENDS= mapi:${PORTSDIR}/mail/libmapi RUN_DEPENDS= evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 CONFLICTS= evolution-mapi-2.[0-9]* @@ -26,7 +22,7 @@ BROKEN= needs newer libmapi which needs samba4 update. EVO_VER= 3.4.3 LATEST_LINK= evolution-mapi3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pkgconfig USE_GMAKE= yes USE_GNOME= gconf2 USE_LDCONFIG= yes diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 59b3ce798..3c2f25446 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/mail/evolution/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution PORTVERSION= 2.32.1 @@ -12,19 +12,18 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An integrated mail, calendar and address book distributed suite -LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview +LIB_DEPENDS= nss3:${PORTSDIR}/security/nss \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell CONFLICTS= evolution-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix desktop-file-utils USE_GNOME= gnomeprefix intlhack evolutiondataserver gtkhtml3 \ - desktopfileutils gnomedocutils ltasneededhack gnomedesktop + gnomedocutils ltasneededhack gnomedesktop USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile index 9be0829e1..d13e2f356 100644 --- a/mail/evolution3/Makefile +++ b/mail/evolution3/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/mail/evolution3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution PORTVERSION= 3.4.4 @@ -13,7 +13,7 @@ COMMENT= An integrated mail, calendar and address book distributed suite LIB_DEPENDS= nss3:${PORTSDIR}/security/nss \ goa-1.0:${PORTSDIR}/net/gnome-online-accounts \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ notify:${PORTSDIR}/devel/libnotify CONFLICTS= evolution-2.[0-9]* @@ -21,10 +21,9 @@ CONFLICTS= evolution-2.[0-9]* LATEST_LINK= evolution3 USE_XZ= yes USE_GMAKE= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix desktop-file-utils USE_GNOME= gnomeprefix intlhack evolutiondataserver3 gtkhtml4 \ - desktopfileutils gnomedocutils ltasneededhack gnomedesktop3 + gnomedocutils ltasneededhack gnomedesktop3 USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 7f9b59495..c4e75f003 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/math/gcalctool/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gcalctool PORTVERSION= 5.32.2 @@ -16,8 +16,7 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows CONFLICTS= gcalctool-6.[0-9]* USE_BZIP2= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomeprefix intlhack gconf2 gnomedocutils gtk20 diff --git a/math/gcalctool3/Makefile b/math/gcalctool3/Makefile index 83406e961..5ef0c006d 100644 --- a/math/gcalctool3/Makefile +++ b/math/gcalctool3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/math/gcalctool3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gcalctool PORTVERSION= 6.4.2.1 @@ -18,8 +18,7 @@ BUILD_DEPENDS= yelp-build:${PORTSDIR}/textproc/yelp-tools \ LATEST_LINK= gcalctool3 USE_XZ= yes -USES= bison pathfix -USE_GETTEXT= yes +USES= bison gettext pathfix USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack gconf2 gtk30 libxml2 diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index d885830ab..193308da5 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-devel-docs -# Date created: 2007-09-18 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/misc/gnome-devel-docs/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-devel-docs PORTVERSION= 2.32.0 diff --git a/misc/gnome-devel-docs3/Makefile b/misc/gnome-devel-docs3/Makefile index 7a81a9847..d125420da 100644 --- a/misc/gnome-devel-docs3/Makefile +++ b/misc/gnome-devel-docs3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-devel-docs -# Date created: 2007-09-18 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/misc/gnome-devel-docs3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-devel-docs PORTVERSION= 3.4.1 diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile index 36f5d0a54..589192622 100644 --- a/misc/gnome-icon-theme-extras/Makefile +++ b/misc/gnome-icon-theme-extras/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-icon-theme-extras -# Date Created: 27 March 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/misc/gnome-icon-theme-extras/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-icon-theme-extras PORTVERSION= 3.4.0 @@ -22,7 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack intlhack gtk-update-icon-cache +USES= pathfix +USE_GNOME= intlhack gtk-update-icon-cache INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-icon-mapping CPPFLAGS+= -I${LOCALBASE}/include diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index cc781411c..60b38c754 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-icon-theme -# Date Created: 05 October 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/misc/gnome-icon-theme/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-icon-theme PORTVERSION= 3.4.0 @@ -22,7 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack intlhack gtk-update-icon-cache +USES= pathfix +USE_GNOME= intlhack gtk-update-icon-cache INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-icon-mapping CPPFLAGS+= -I${LOCALBASE}/include diff --git a/misc/gnome-user-docs3/Makefile b/misc/gnome-user-docs3/Makefile index f3e6d5845..ce1153b08 100644 --- a/misc/gnome-user-docs3/Makefile +++ b/misc/gnome-user-docs3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomeuserdocs2 -# Date created: 07 July 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/misc/gnome-user-docs3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-user-docs PORTVERSION= 3.4.2 @@ -22,6 +18,7 @@ USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes -USE_GNOME= gnomeprefix gnomehack gnomehier libxml2 +USES= pathfix +USE_GNOME= gnomeprefix gnomehier libxml2 .include <bsd.port.mk> diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 213ec62f8..6bff660a1 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -13,10 +13,9 @@ COMMENT= MIME types database from the freedesktop.org project USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-update-mimedb -USE_GETTEXT= yes +USES= gettext pathfix USE_GMAKE= yes USE_PKGCONFIG= build -USES= pathfix USE_GNOME= glib20 libxml2 intltool intlhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index db390d152..896f45133 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: cheese -# Date created: 13 January 2008 -# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> -# +# Created by: FreeBSD GNOME Team <gnome@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/multimedia/cheese/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= cheese PORTVERSION= 2.32.0 @@ -17,17 +13,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS= canberra-gtk:${PORTSDIR}/audio/libcanberra \ + hal:${PORTSDIR}/sysutils/hal CONFLICTS= cheese-3.[0-9]* USE_XORG= xxf86vm USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \ +USE_GNOME= gnomeprefix intlhack evolutiondataserver librsvg2 \ gnomedocutils gnomedesktop -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GSTREAMER= gconf good ogg theora v4l2 vorbis INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/multimedia/cheese3/Makefile b/multimedia/cheese3/Makefile index cfb6ed3ac..5065bd5d9 100644 --- a/multimedia/cheese3/Makefile +++ b/multimedia/cheese3/Makefile @@ -1,10 +1,5 @@ -# New ports collection makefile for: cheese -# Date created: 13 January 2008 -# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> -# # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/multimedia/cheese3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= cheese PORTVERSION= 3.4.2 @@ -35,9 +30,9 @@ LATEST_LINK= cheese3 USE_XORG= xxf86vm x11 USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver3 librsvg2 \ +USE_GNOME= gnomeprefix intlhack evolutiondataserver3 librsvg2 \ gnomedesktop3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GSTREAMER= bad gconf good jpeg ogg theora v4l2 vorbis INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index e28ddba43..811b1ac4a 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: clutter-gst -# Date created: 2008-12-25 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/multimedia/clutter-gst/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= clutter-gst PORTVERSION= 1.6.0 @@ -18,7 +15,8 @@ LIB_DEPENDS= clutter-1.0:${PORTSDIR}/graphics/clutter USE_GMAKE= yes USE_XZ= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack gnomeprefix +USES= pathfix +USE_GNOME= ltverhack gnomeprefix USE_GSTREAMER= yes USE_XORG= xp x11 USE_LDCONFIG= yes diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index 91d1535ba..59396eeb2 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -1,6 +1,6 @@ # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/multimedia/gstreamer1-plugins/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gstreamer1-plugins PORTVERSION?= ${BASE_PORTVERSION} @@ -41,15 +41,14 @@ UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= base SHLIB_VERSION= 0 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig # xxx remove when 1.0 is offical released VERSION= ${GST1_VERSION} #VERSION= 1.0 WANT_GSTREAMER= yes USE_XZ= yes USE_GMAKE= yes -USE_GNOME+= gnomehack ltverhack:0 ltasneededhack -USE_PKGCONFIG= build +USE_GNOME+= ltverhack:0 ltasneededhack USE_AUTOTOOLS= libtool GST_PLUGIN?= base USE_LDCONFIG= yes diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 87eb2f827..045a3e7e3 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -1,6 +1,6 @@ # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/multimedia/gstreamer1/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gstreamer1 PORTVERSION= 1.0.5 @@ -18,13 +18,11 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection CFLAGS:= ${CFLAGS} -O2 -Wno-format -USES= bison pathfix +USES= bison gettext pathfix pkgconfig USE_XZ= yes USE_GMAKE= yes MAKE_JOBS_SAVE= yes USE_GNOME= glib20 ltverhack:0 ltasneededhack -USE_PKGCONFIG= build -USE_GETTEXT= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-tests \ --disable-examples \ diff --git a/multimedia/libgnome-media-profiles/Makefile b/multimedia/libgnome-media-profiles/Makefile index 20c9067f2..959ab8fbe 100644 --- a/multimedia/libgnome-media-profiles/Makefile +++ b/multimedia/libgnome-media-profiles/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: libgnome-media-profiles -# Date Created: 15 April 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom$ @@ -15,13 +12,13 @@ COMMENT= Library that contains code to manage media profiles CONFLICTS= gnome-media-2.[0-9]* -USE_GNOME= gnomehack gtk30 gconf2 intlhack gnomedocutils +USE_GNOME= gtk30 gconf2 intlhack gnomedocutils USE_GMAKE= yes GNU_CONFIGURE= yes USE_GSTREAMER= yes USE_LDCONFIG= yes INSTALLS_OMF= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GCONF_SCHEMAS= gnome-media-profiles.schemas diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index b485037ea..fe171b7ea 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: totem-pl-parser -# Date created: 2007-12-04 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/multimedia/totem-pl-parser/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= totem-pl-parser PORTVERSION= 3.4.2 @@ -16,15 +12,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GObject-based library to parse a host of playlist formats BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gmime-2.4.6:${PORTSDIR}/mail/gmime24 \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome +LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix glib20 libxml2 intlhack ltverhack \ - gnomehier -USE_GETTEXT= yes +USE_GNOME= gnomeprefix glib20 libxml2 intlhack ltverhack gnomehier +USES= gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --enable-libarchive diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 97838f32a..1d465f38e 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: totem -# Date created: 17 Oct 2002 -# Whom: Hendrik Scholz <hendrik@scholz.net> -# +# Created by: Hendrik Scholz <hendrik@scholz.net> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/multimedia/totem/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= totem PORTVERSION= 2.32.0 @@ -18,8 +14,8 @@ COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= gdata.7:${PORTSDIR}/devel/libgdata06 \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata @@ -28,9 +24,8 @@ CONFLICTS= totem-3.[0-9]* USE_PYTHON= yes USE_BZIP2= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils \ - nautilus2 ltverhack pygtk2 gnomehier +USES= gettext pathfix pkgconfig desktop-file-utils +USE_GNOME= gnomeprefix intlhack nautilus2 ltverhack pygtk2 gnomehier USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio INSTALLS_ICONS= yes USE_GMAKE= yes @@ -123,7 +118,6 @@ post-patch: ${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c post-install: - @-update-desktop-database ${MKDIR} ${PREFIX}/share/vala/vapi ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vapi ${PREFIX}/share/vala/vapi ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 0ef1a4e38..c221c3c3c 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -557,8 +557,6 @@ share/vala/vapi/totem.vapi @dirrm lib/totem/plugins @dirrm lib/totem %%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile index f45e95040..cd790945e 100644 --- a/multimedia/totem3/Makefile +++ b/multimedia/totem3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: totem -# Date created: 17 Oct 2002 -# Whom: Hendrik Scholz <hendrik@scholz.net> -# +# Created by: Hendrik Scholz <hendrik@scholz.net> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/multimedia/totem3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= totem PORTVERSION= 3.4.2 @@ -19,11 +15,11 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso- ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= gdata.13:${PORTSDIR}/devel/libgdata \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - clutter-gst-1.0.0:${PORTSDIR}/multimedia/clutter-gst \ - clutter-gtk-1.0.0:${PORTSDIR}/graphics/clutter-gtk3 \ - mx-1.0.2:${PORTSDIR}/x11-toolkits/mx \ - peas-1.0.0:${PORTSDIR}/devel/libpeas \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + clutter-gst-1.0:${PORTSDIR}/multimedia/clutter-gst \ + clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \ + mx-1.0:${PORTSDIR}/x11-toolkits/mx \ + peas-1.0:${PORTSDIR}/devel/libpeas \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \ @@ -36,9 +32,9 @@ LATEST_LINK= totem3 USE_PYTHON= yes USE_XORG= x11 xproto xtst ice sm USE_XZ= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gtk30 libxml2 \ - nautilus3 ltverhack pygobject3 gnomedocutils gnomehier +USES= gettext pathfix pkgconfig desktop-file-utils +USE_GNOME= gnomeprefix intlhack gtk30 libxml2 nautilus3 ltverhack \ + pygobject3 gnomedocutils gnomehier USE_GSTREAMER= core good mpeg2dec soup ugly gio resindvd INSTALLS_ICONS= yes USE_GMAKE= yes @@ -138,7 +134,6 @@ post-patch: ${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c post-install: - @-update-desktop-database # ${MKDIR} ${PREFIX}/share/vala/vapi # ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vapi ${PREFIX}/share/vala/vapi # ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi diff --git a/multimedia/totem3/pkg-plist b/multimedia/totem3/pkg-plist index 87d251475..09a679a82 100644 --- a/multimedia/totem3/pkg-plist +++ b/multimedia/totem3/pkg-plist @@ -672,5 +672,3 @@ share/thumbnailers/totem.thumbnailer %%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% @dirrm include/totem/1.0 @dirrm include/totem -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 82fd7498f..aac16f837 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: empathy -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/empathy/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= empathy PORTVERSION= 2.34.0 @@ -17,16 +14,16 @@ COMMENT= GNOME IM client based around telepathy BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - telepathy.2:${PORTSDIR}/net-im/libtelepathy \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \ - telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \ - folks-telepathy.22:${PORTSDIR}/net-im/folks04 \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - notify.4:${PORTSDIR}/devel/libnotify \ - gcr.0:${PORTSDIR}/security/gnome-keyring \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + telepathy:${PORTSDIR}/net-im/libtelepathy \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \ + telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \ + folks-telepathy:${PORTSDIR}/net-im/folks04 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + notify:${PORTSDIR}/devel/libnotify \ + gcr:${PORTSDIR}/security/gnome-keyring \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control @@ -35,9 +32,9 @@ CONFLICTS= empathy-3.[0-9]* USE_GMAKE= yes USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes -USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack +USE_GNOME= evolutiondataserver gnomeprefix pygtk2 ltverhack USE_GSTREAMER= yes USE_AUTOTOOLS= libtool INSTALLS_OMF= yes diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile index 7bb3fcc37..b4d7c073c 100644 --- a/net-im/empathy3/Makefile +++ b/net-im/empathy3/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: empathy -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/empathy3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= empathy PORTVERSION= 3.4.2.1 @@ -18,18 +15,18 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso- gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ itstool:${PORTSDIR}/textproc/itstool \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - pulse.0:${PORTSDIR}/audio/pulseaudio \ - telepathy.2:${PORTSDIR}/net-im/libtelepathy \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - telepathy-farstream.2:${PORTSDIR}/net-im/telepathy-farstream \ - telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \ - folks-telepathy.25:${PORTSDIR}/net-im/folks \ - notify.4:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + pulse:${PORTSDIR}/audio/pulseaudio \ + telepathy:${PORTSDIR}/net-im/libtelepathy \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + telepathy-farstream:${PORTSDIR}/net-im/telepathy-farstream \ + telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \ + folks-telepathy:${PORTSDIR}/net-im/folks \ + notify:${PORTSDIR}/devel/libnotify \ gcr-3:${PORTSDIR}/security/gcr \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ clutter-gst-1.0:${PORTSDIR}/multimedia/clutter-gst \ - webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 \ + webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ @@ -41,16 +38,16 @@ CONFLICTS= empathy-2.[0-9]* LATEST_LINK= empathy3 USE_GMAKE= yes USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes -USE_GNOME= evolutiondataserver3 gnomehack gnomeprefix ltverhack +USE_GNOME= evolutiondataserver3 gnomeprefix ltverhack USE_GSTREAMER= yes USE_AUTOTOOLS= libtool INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-Werror \ --disable-goa \ --enable-location=no diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index cbf543195..bf029f601 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/farsight2/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= farsight2 PORTVERSION= 0.0.31 @@ -16,11 +16,9 @@ CONFLICTS= farstream-[0-9]* FETCH_ARGS= -Fpr USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_PYTHON= yes -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= glib20 ltverhack USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile index b57e8a2b8..96efb0c8f 100644 --- a/net-im/farstream/Makefile +++ b/net-im/farstream/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/farstream/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= farstream PORTVERSION= 0.1.2 @@ -16,11 +16,9 @@ CONFLICTS= farsight2-[0-9]* FETCH_ARGS= -Fpr USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_PYTHON= yes -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= glib20 ltverhack USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index 03836d7c0..acbf5ba13 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/folks/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= folks PORTVERSION= 0.7.0 @@ -12,8 +12,8 @@ COMMENT= library to aggregates people from multiple sources BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee06 \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib CONFLICTS= folks-0.4.[0-9]* @@ -21,8 +21,8 @@ USE_XZ= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehier gnomehack intlhack ltverhack evolutiondataserver3 -USE_GETTEXT= yes +USE_GNOME= gnomehier intlhack ltverhack evolutiondataserver3 +USES= gettext pathfix GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile index 6dcc7b53c..6051289d5 100644 --- a/net-im/folks04/Makefile +++ b/net-im/folks04/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: folks -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net-im/folks04/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= folks PORTVERSION= 0.4.3 @@ -16,16 +12,16 @@ COMMENT= library to aggregates people from multiple sources BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee06 \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib CONFLICTS= folks-0.[6-9].[0-9]* USE_BZIP2= yes USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier -USE_GETTEXT= yes +USE_GNOME= intlhack gnomehier +USES= gettext pathfix GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 780471c7b..32392a2c6 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -11,10 +11,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library and transmitter that implements ICE-19 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= glib20 ltverhack USE_GSTREAMER= yes USE_AUTOTOOLS= libtool diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index ffc876b02..9cdee83d2 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -14,10 +14,10 @@ LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn USE_BZIP2= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack glib20 ltverhack +USE_GNOME= glib20 ltverhack CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile index 4a952e00e..fe1e2b29c 100644 --- a/net-im/papyon/Makefile +++ b/net-im/papyon/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: papyon -# Date created: August 1 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= papyon PORTVERSION= 0.5.6 diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile index d6e80cef8..229841e8b 100644 --- a/net-im/telepathy-logger/Makefile +++ b/net-im/telepathy-logger/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: telepathy-logger -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net-im/telepathy-logger/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= telepathy-logger PORTVERSION= 0.4.0 @@ -14,19 +11,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Logger utility library for the Telepathy framework BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USES= pathfix +USES= pathfix pkgconfig USE_GNOME= glib20 intltool gnomedocutils ltverhack libxml2 libxslt:build -USE_PKGCONFIG= build USE_SQLITE= yes USE_PYTHON_BUILD= yes GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 56bf8c65b..04609ef02 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi -# Date created: 18 November 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi-app/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= avahi PORTVERSION= 0.6.31 @@ -20,17 +16,17 @@ AVAHI_SLAVE?= no .if ${AVAHI_SLAVE}!="header" BUILD_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \ - daemon.0:${PORTSDIR}/devel/libdaemon \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - gdbm.4:${PORTSDIR}/databases/gdbm +LIB_DEPENDS?= expat:${PORTSDIR}/textproc/expat2 \ + daemon:${PORTSDIR}/devel/libdaemon \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + gdbm:${PORTSDIR}/databases/gdbm RUN_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USERS?= ${PORTNAME} GROUPS?= ${USERS} -USE_GNOME?= gnomehack ltverhack glib20 intltool -USE_GETTEXT= yes +USE_GNOME?= ltverhack glib20 intltool +USES= gettext pathfix pkgconfig USE_GNOME_SUBR= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile index f33f40944..f42860495 100644 --- a/net/avahi-gtk/Makefile +++ b/net/avahi-gtk/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi-gtk -# Date created: 31 July 2007 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi-gtk/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= net diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile index 574963f46..d52d662e0 100644 --- a/net/avahi-gtk3/Makefile +++ b/net/avahi-gtk3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi-gtk -# Date created: 31 July 2007 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi-gtk3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= net diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile index 8e1145457..4aa747fe2 100644 --- a/net/avahi-header/Makefile +++ b/net/avahi-header/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi-gtk -# Date created: 31 July 2007 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi-header/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= net diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile index a972c29de..438abdb06 100644 --- a/net/avahi-qt3/Makefile +++ b/net/avahi-qt3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi-qt3 -# Date created: 12 April 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi-qt3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= net @@ -13,7 +9,7 @@ PKGNAMESUFFIX= -qt3 MAINTAINER= gnome@FreeBSD.org COMMENT= Qt 3 bindings to the Avahi mDNS system -LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app +LIB_DEPENDS= avahi-common:${PORTSDIR}/net/avahi-app MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-qt @@ -22,7 +18,8 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= qt3 -USE_GNOME= gnomehack ltverhack intltool +USES= pathfix +USE_GNOME= ltverhack intltool USE_QT_VER= 3 AVAHI_PKGCONFIG= avahi-qt3.pc diff --git a/net/avahi/Makefile b/net/avahi/Makefile index ffc40c0e3..b34f61a46 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: avahi -# Date created: 18 November 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/avahi/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= avahi PORTVERSION= 0.6.31 diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index c452f9d98..e303412a7 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,9 +1,6 @@ -# Ports collection Makefile for: gnomemeeting -# Date created: 24/07/2001 -# Whom: roger@FreeBSD.org -# +# Created by: roger@FreeBSD.org # $FreeBSD$ -# +# $MCom$ PORTNAME= ekiga PORTVERSION= 2.0.11 @@ -23,10 +20,10 @@ CONFLICTS= ekiga3-3.* USE_BZIP2= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix USE_SDL= sdl INSTALLS_OMF= yes -USE_GNOME= libgnomeui gnomeprefix gnomehack gnomedocutils \ +USE_GNOME= libgnomeui gnomeprefix gnomedocutils \ evolutiondataserver intlhack GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile index 3c7d60487..e44d471a7 100644 --- a/net/ekiga3/Makefile +++ b/net/ekiga3/Makefile @@ -22,10 +22,10 @@ CONFLICTS= ekiga-2.* USE_PERL5= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_XORG= xv -USE_GNOME= gtk20 gnomehack +USE_GNOME= gtk20 DIST_SUBDIR= gnome2 INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index 88b4af19a..728e1192e 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomenetwork -# Date Created: 03 June 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/gnome-nettool/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-nettool PORTVERSION= 2.32.0 @@ -17,14 +13,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME utility that provides network information statistics -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop CONFLICTS= gnome-nettool-3.[0-9]* USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils +USE_GNOME= intlhack gnomeprefix libglade2 gconf2 gnomedocutils USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/net/gnome-nettool3/Makefile b/net/gnome-nettool3/Makefile index 4c688e943..31835cfe9 100644 --- a/net/gnome-nettool3/Makefile +++ b/net/gnome-nettool3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomenetwork -# Date Created: 03 June 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/gnome-nettool3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-nettool PORTVERSION= 3.2.0 @@ -16,15 +12,15 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME utility that provides network information statistics -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop CONFLICTS= gnome-nettool-2.[0-9]* LATEST_LINK= gnome-nettool3 USE_XZ= yes -USE_GNOME= gnomehack intlhack gnomeprefix gtk30 gnomedocutils +USE_GNOME= intlhack gnomeprefix gtk30 gnomedocutils USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile index 1dbb328f7..3a14f402c 100644 --- a/net/gnome-online-accounts/Makefile +++ b/net/gnome-online-accounts/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: gnome-online-accounts -# Date Created: 15 Sep 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net/gnome-online-accounts/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-online-accounts PORTVERSION= 3.4.2 @@ -22,9 +19,9 @@ LIB_DEPENDS= webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ rest-0.7:${PORTSDIR}/www/rest USE_XZ= yes -USE_GNOME= gnomehack gtk30 intlhack +USE_GNOME= gtk30 intlhack USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 9a957d495..f2c008c04 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -17,9 +17,9 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ CONFLICTS= gtk-vnc-0.4.[0-9]* -USE_GNOME= pygtk2 gnomehack +USE_GNOME= pygtk2 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_PYTHON= yes GNU_CONFIGURE= yes diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index d2797302f..eb1c31946 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgweather -# Date created: 14th Jan 2008 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/libgweather/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgweather PORTVERSION= 2.30.3 @@ -16,15 +12,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library to accessing online weather informations BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= libgweather-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack +USE_GNOME= gnomeprefix intlhack gconf2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net/libgweather3/Makefile b/net/libgweather3/Makefile index 743210e83..619207675 100644 --- a/net/libgweather3/Makefile +++ b/net/libgweather3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgweather -# Date created: 14th Jan 2008 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/libgweather3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgweather PORTVERSION= 3.4.1 @@ -15,18 +11,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library to accessing online weather informations BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= libgweather-2.[0-9]* LATEST_LINK= libgweather3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack gtk30 +USE_GNOME= gnomeprefix intlhack gconf2 ltverhack gtk30 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index 95ef305a5..41ad88517 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: libproxy -# Date created: 26 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/net/libproxy/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libproxy PORTVERSION= 0.4.6 diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index c4af2ed20..559a2aa26 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vinagre -# Date created: 16 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/vinagre/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= vinagre PORTVERSION= 2.30.3 @@ -16,18 +12,17 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop -LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ - avahi-core.7:${PORTSDIR}/net/avahi-app \ - avahi-ui.0:${PORTSDIR}/net/avahi-gtk \ - gdbm.4:${PORTSDIR}/databases/gdbm \ +LIB_DEPENDS= gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \ + avahi-core:${PORTSDIR}/net/avahi-app \ + avahi-ui:${PORTSDIR}/net/avahi-gtk \ + gdbm:${PORTSDIR}/databases/gdbm \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring CONFLICTS= vinagre-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \ - gnomepanel +USES= gettext pathfix desktop-file-utils shared-mime-info +USE_GNOME= gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -54,8 +49,6 @@ PLIST_SUB+= TELEPATHY="@comment " .endif post-install: - @-update-desktop-database > /dev/null - @-update-mime-database ${PREFIX}/share/mime > /dev/null .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist index e104951d7..a8b4705f3 100644 --- a/net/vinagre/pkg-plist +++ b/net/vinagre/pkg-plist @@ -327,10 +327,6 @@ share/vinagre-1/plugins/vnc/vnc.ui @dirrm lib/vinagre-1 @dirrm include/vinagre-1.0/vinagre @dirrm include/vinagre-1.0 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile index d6043fd1f..406b9aab8 100644 --- a/net/vinagre3/Makefile +++ b/net/vinagre3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vinagre -# Date created: 16 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/vinagre3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= vinagre PORTVERSION= 3.4.2 @@ -27,8 +23,8 @@ CONFLICTS= vinagre-2.[0-9]* LATEST_LINK= vinagre3 USE_XZ= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk30 libxml2 vte3 +USES= gettext pathfix pkgconfig desktop-file-utils shared-mime-info +USE_GNOME= gnomeprefix intlhack gtk30 libxml2 vte3 USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -41,21 +37,23 @@ GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml MAN1= vinagre.1 -OPTIONS= TELEPATHY "Enable telepathy integration" on \ - RDP "Enable MS Windows remote desktop support" off +OPTIONS_DEFINE= TELEPATHY RDP +OPTIONS_DEFAULT=TELEPATHY +TELEPATHY= Telepathy integration +RDP_DESC= MS Windows remote desktop support .include <bsd.port.options.mk> -.if !defined(WITHOUT_TELEPATHY) -LIB_DEPENDS+= telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +.if ${PORT_OPTIONS:MTELEPATHY} +LIB_DEPENDS+= telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib PLIST_SUB+= TELEPATHY="" .else CONFIGURE_ARGS+=--without-telepathy PLIST_SUB+= TELEPATHY="@comment " .endif -.if !defined(WITHOUT_RDP) +.if ${PORT_OPTIONS:MRDP} BUILD_DEPENDS+= rdesktop:${PORTSDIR}/net/rdesktop RUN_DEPENDS+= rdesktop:${PORTSDIR}/net/rdesktop CONFIGURE_ARGS+=--enable-rdp @@ -66,9 +64,7 @@ PLIST_SUB+= RDP="@comment " .endif post-install: - @-update-desktop-database > /dev/null - @-update-mime-database ${PREFIX}/share/mime > /dev/null -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in AUTHORS COPYING ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} diff --git a/net/vinagre3/pkg-plist b/net/vinagre3/pkg-plist index 5cd5b80dc..27ace6cae 100644 --- a/net/vinagre3/pkg-plist +++ b/net/vinagre3/pkg-plist @@ -347,7 +347,3 @@ share/mime/packages/vinagre-mime.xml @dirrmtry share/help %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/net/vino/Makefile b/net/vino/Makefile index 0e36309b4..65b6763d9 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vino -# Date created: 16 July 2004 -# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> -# +# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/vino/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= vino PORTVERSION= 2.32.2 @@ -17,14 +13,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique CONFLICTS= vino-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel +USES= gettext pathfix pkgconfig +USE_GNOME= gnomeprefix intlhack gnomepanel USE_XORG= xtst USE_GMAKE= yes GNU_CONFIGURE= yes @@ -34,8 +30,13 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= vino-server.schemas -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +OPTIONS_DEFINE= NOTIFY +OPTIONS_DEFAULT=NOTIFY + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-libnotify=yes .else CONFIGURE_ARGS+=--enable-libnotify=no diff --git a/net/vino3/Makefile b/net/vino3/Makefile index 7e427c1f3..d116f7897 100644 --- a/net/vino3/Makefile +++ b/net/vino3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vino -# Date created: 16 July 2004 -# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> -# +# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/net/vino3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= vino PORTVERSION= 3.4.2 @@ -26,8 +22,8 @@ CONFLICTS= vino-2.[0-9]* LATEST_LINK= vino3 USE_XZ= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk30 +USES= gettext pathfix +USE_GNOME= gnomeprefix intlhack gtk30 USE_XORG= xdamage xfixes xtst USE_GMAKE= yes GNU_CONFIGURE= yes @@ -38,8 +34,13 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +OPTIONS_DEFINE= NOTIFY +OPTIONS_DEFAULT=NOTIFY + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--without-libnotify .endif diff --git a/ports-mgmt/packagekit-qt4/Makefile b/ports-mgmt/packagekit-qt4/Makefile index c0b0f54c2..7621327c5 100644 --- a/ports-mgmt/packagekit-qt4/Makefile +++ b/ports-mgmt/packagekit-qt4/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: PackageKit-qt -# Date created: 5 jan 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/ports-mgmt/packagekit-qt4/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 PKGNAMESUFFIX= -qt4 diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index f5a4940bb..1a443f614 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: packagekit -# Date created: 15 Aug 2009 -# Whom: Anders F Bjorklund <afb@users.sourceforge.net> -# +# Created by: Anders F Bjorklund <afb@users.sourceforge.net> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/ports-mgmt/packagekit/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= PackageKit PORTVERSION= 0.6.21 @@ -16,20 +13,19 @@ COMMENT?= A DBUS packaging abstraction layer BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit + ck-connector:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes USE_XZ= yes -USE_GETTEXT= yes +USES= gettext shared-mime-info iconv USE_GNOME= glib20 intltool USE_QT4= #empty -USE_ICONV= yes USE_LDCONFIG= yes USE_SQLITE= yes USE_PYTHON_BUILD= 2.5+ @@ -112,7 +108,6 @@ post-install: .if !defined(SLAVEPORT) @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ ${PREFIX}/share/PackageKit/transactions.db - @-update-mime-database ${PREFIX}/share/mime > /dev/null .endif .include <bsd.port.post.mk> diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist index 783f50be5..664f304ec 100644 --- a/ports-mgmt/packagekit/pkg-plist +++ b/ports-mgmt/packagekit/pkg-plist @@ -437,5 +437,3 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy @dirrmtry etc/PackageKit/events/pre-transaction.d @dirrmtry etc/PackageKit/events @dirrmtry etc/PackageKit -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile index 1f3c90863..2fcf2a989 100644 --- a/print/cups-pk-helper/Makefile +++ b/print/cups-pk-helper/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: cups-pk-helper -# Date created: 2009-12-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/print/cups-pk-helper/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= cups-pk-helper PORTVERSION= 0.2.0 @@ -13,14 +10,14 @@ MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= A helper that makes system-config-printer use PolicyKit -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - cups.2:${PORTSDIR}/print/cups-client \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + cups:${PORTSDIR}/print/cups-client \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack glib20 -USE_GETTEXT= yes +USE_GNOME= intlhack glib20 +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/libs diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile index b988f3397..076acff8a 100644 --- a/print/libgnomecups/Makefile +++ b/print/libgnomecups/Makefile @@ -16,10 +16,8 @@ LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client USE_BZIP2= yes USE_GMAKE= yes -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= intlhack ltverhack glib20 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile index 48ae64479..095e6091f 100644 --- a/science/gchemutils/Makefile +++ b/science/gchemutils/Makefile @@ -23,10 +23,9 @@ PORTSCOUT= limitw:1,even USE_XZ= yes USE_XORG= x11 -USES= pathfix shared-mime-info USE_GNOME= intlhack gnomedocutils gtk30 libgsf libxml2 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix shared-mime-info USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -49,7 +48,7 @@ PLIST_SUB= VER=0.14 GOFFICE=0.10 GNUMERIC_VER=1.12.1 OPTIONS_DEFINE= XUL XUL_DESC= Build browser plugin (requires Xulrunner) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MXUL} USE_GECKO= libxul @@ -70,4 +69,4 @@ PLIST_SUB+= GNUMERIC="@comment " post-patch: @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/libs/gcp/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/gcr/Makefile b/security/gcr/Makefile index d4c1d6f42..50f4632ef 100644 --- a/security/gcr/Makefile +++ b/security/gcr/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/security/gcr/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= gcr PORTVERSION= 3.4.1 @@ -11,21 +11,17 @@ MAINTAINER= kwm@FreeBSD.org COMMENT= Library for bits of crypto UI and parsing BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info \ gtk-doc>0:${PORTSDIR}/textproc/gtk-doc LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ tasn1:${PORTSDIR}/security/libtasn1 \ p11-kit:${PORTSDIR}/security/p11-kit \ gcrypt:${PORTSDIR}/security/libgcrypt -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 -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= gtk30 intlhack -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig shared-mime-info USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 04bc95ac5..8e4dcf73e 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/security/gnome-keyring/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-keyring PORTVERSION= 2.32.1 @@ -19,9 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro CONFLICTS= gnome-keyring-3.[0-9]* gcr-3.[0-9]* USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack +USE_GNOME= gnomeprefix gtk20 ltverhack intlhack USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \ diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile index 0fc0628f1..59706bfa4 100644 --- a/security/gnome-keyring3/Makefile +++ b/security/gnome-keyring3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/security/gnome-keyring3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-keyring PORTVERSION= 3.4.1 @@ -26,9 +26,9 @@ CONFLICTS= gnome-keyring-2.[0-9]* LATEST_LINK= gnome-keyring3 USE_XZ= yes -USE_GNOME= gnomehack gnomeprefix gtk30 ltverhack intlhack +USE_GNOME= gnomeprefix gtk30 ltverhack intlhack USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile index a8c43e999..6d40d1ba5 100644 --- a/security/libcryptui/Makefile +++ b/security/libcryptui/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: Seahorse -# Date created: 08 March 2000 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/security/libcryptui/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libcryptui PORTVERSION= 3.4.1 @@ -16,8 +12,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME application for managing encryption keys (PGP, SSH) BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg @@ -25,9 +21,9 @@ CONFLICTS= seahorse-2.[0-9]* seahorse-3.0.[0-9]* USE_LDCONFIG= yes USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gnomedocutils gtk30 +USE_GNOME= intlhack gnomeprefix gnomedocutils gtk30 GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib @@ -36,12 +32,12 @@ CONFIGURE_ARGS= --enable-introspection=no GLIB_SCHEMAS= org.gnome.seahorse.recipients.gschema.xml MAN1= seahorse-daemon.1 -OPTIONS= NOTIFY "Enable libnotify support" on +OPTIONS_DEFINE= NOTIFY .include <bsd.port.options.mk> -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-libnotify .endif diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile index 291d92515..cad67d7c8 100644 --- a/security/libgnome-keyring/Makefile +++ b/security/libgnome-keyring/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/security/libgnome-keyring/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgnome-keyring PORTVERSION= 3.4.1 @@ -15,9 +15,9 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ gcrypt:${PORTSDIR}/security/libgcrypt USE_XZ= yes -USE_GNOME= gnomehier gnomehack gnomeprefix ltverhack intlhack glib20 +USE_GNOME= gnomehier gnomeprefix ltverhack intlhack glib20 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile index 19d04c774..0582173c7 100644 --- a/security/libsecret/Makefile +++ b/security/libsecret/Makefile @@ -13,10 +13,9 @@ COMMENT= Library to access the secret service API LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt USE_XZ= yes -USES= pathfix USE_GNOME= gnomehier glib20 libxslt:build intltool USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-introspection --disable-vala diff --git a/security/seahorse-sharing/Makefile b/security/seahorse-sharing/Makefile index c0138015b..d46d9d6f8 100644 --- a/security/seahorse-sharing/Makefile +++ b/security/seahorse-sharing/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: Seahorse -# Date created: 08 March 2000 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ # $MCom$ -# PORTNAME= seahorse-sharing PORTVERSION= 3.2.1 @@ -16,16 +12,16 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Seahorse PGP public key sharing using DNS-SD and HKP. BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ - avahi-glib.1:${PORTSDIR}/net/avahi-app \ - soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + avahi-glib:${PORTSDIR}/net/avahi-app \ + soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ seahorse>=3.2.1:${PORTSDIR}/security/seahorse3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix +USE_GNOME= intlhack gnomeprefix GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS= -I${LOCALBASE}/include diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index b95147c7f..7ca3ac73d 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: Seahorse -# Date created: 08 March 2000 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/security/seahorse/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= seahorse PORTVERSION= 2.32.0 @@ -18,20 +14,20 @@ COMMENT= GNOME application for managing encryption keys (PGP, SSH) BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - gcr.0:${PORTSDIR}/security/gnome-keyring \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ - soup-2.4.1:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + gcr:${PORTSDIR}/security/gnome-keyring \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + soup-2.4:${PORTSDIR}/devel/libsoup CONFLICTS= libcryptui-3.[0-9]* seahorse-3.[0-9]* USE_XORG= sm USE_LDCONFIG= yes USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils +USE_GNOME= intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile index 996e4cc8f..ec47a07f2 100644 --- a/security/seahorse3/Makefile +++ b/security/seahorse3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: Seahorse -# Date created: 08 March 2000 -# Whom: Dave McKay <dave@mu.org> -# +# Created by: Dave McKay <dave@mu.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/security/seahorse3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= seahorse PORTVERSION= 3.4.1 @@ -17,13 +13,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME application for managing encryption keys (PGP, SSH) BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring \ - cryptui.0:${PORTSDIR}/security/libcryptui \ - gcr-3.1:${PORTSDIR}/security/gcr \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ - soup-2.4.1:${PORTSDIR}/devel/libsoup + cryptui:${PORTSDIR}/security/libcryptui \ + gcr-3:${PORTSDIR}/security/gcr \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + soup-2.4:${PORTSDIR}/devel/libsoup RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= seahorse-2.[0-9]* @@ -32,14 +28,14 @@ LATEST_LINK= seahorse3 USE_XORG= sm USE_LDCONFIG= yes USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix gtk30 gnomedocutils +USE_GNOME= intlhack gnomeprefix gtk30 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.seahorse.gschema.xml \ org.gnome.seahorse.manager.gschema.xml \ diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 2f67cc49f..ee390c04d 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/accountsservice/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= accountsservice PORTVERSION= 0.6.24 @@ -17,8 +17,8 @@ LIB_DEPENDS= xslt:${PORTSDIR}/textproc/libxslt \ polkit-gobject-1:${PORTSDIR}/sysutils/polkit USE_XZ= yes -USE_GNOME= gnomehack glib20 intlhack gnomehier -USE_GETTEXT= yes +USE_GNOME= glib20 intlhack gnomehier +USES= gettext pathfix pkgconfig USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index f6fb772aa..c563df531 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: bonfire -# Date created: 2006-05-12 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/brasero/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= brasero PORTVERSION= 2.32.1 @@ -15,22 +12,22 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ yelp:${PORTSDIR}/x11/yelp CONFLICTS= brasero-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig shared-mime-info desktop-file-utils USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XORG= sm -USE_GNOME= intlhack gnomeprefix gnomehack gnomedocutils +USE_GNOME= intlhack gnomeprefix gnomedocutils USE_LDCONFIG= yes USE_GSTREAMER= gconf core INSTALLS_OMF= yes @@ -48,7 +45,7 @@ OPTIONS= NAUTILUS "Enable Nautilus extension" on \ PLIST_SUB= FULL_VERSION=${PORTVERSION} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if !defined(WITHOUT_NAUTILUS) USE_GNOME+= nautilus2 @@ -60,8 +57,8 @@ CONFIGURE_ARGS+=--enable-nautilus=no .endif .if defined(WITH_LIBBURNIA) -LIB_DEPENDS+= burn.4:${PORTSDIR}/devel/libburn \ - isofs.6:${PORTSDIR}/devel/libisofs +LIB_DEPENDS+= burn:${PORTSDIR}/devel/libburn \ + isofs:${PORTSDIR}/devel/libisofs CONFIGURE_ARGS+=--enable-libburnia PLIST_SUB+= LIBBURNIA="" .else @@ -75,4 +72,4 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/proc/self/fd/0|/dev/fd/0|g' ${WRKSRC}/po/*.po -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index 3b2f6327a..8d170961d 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -512,10 +512,6 @@ share/omf/brasero/brasero-zh_TW.omf @dirrm include/brasero @dirrmtry share/GConf/gsettings @dirrmtry share/GConf -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES diff --git a/sysutils/brasero3/Makefile b/sysutils/brasero3/Makefile index 23ffde5eb..cbafc3aa5 100644 --- a/sysutils/brasero3/Makefile +++ b/sysutils/brasero3/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: bonfire -# Date created: 2006-05-12 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/brasero3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= brasero PORTVERSION= 3.4.1 @@ -14,30 +11,29 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \ + totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao CONFLICTS= brasero-2.[0-9]* LATEST_LINK= brasero3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils shared-mime-info USE_XZ= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XORG= sm ice -USE_GNOME= intlhack gnomeprefix gnomehack gnomedocutils gtk30 gconf2 \ - libxml2 desktopfileutils +USE_GNOME= intlhack gnomeprefix gnomedocutils gtk30 gconf2 libxml2 USE_LDCONFIG= yes USE_GSTREAMER= gconf core INSTALLS_OMF= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-inotify --enable-search=no --enable-playlist=no \ --enable-introspection=yes -CPPFLAGS= -I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1 -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1 +LDFLAGS+= -L${LOCALBASE}/lib MAN1= brasero.1 GLIB_SCHEMAS= org.gnome.brasero.gschema.xml @@ -61,8 +57,8 @@ CONFIGURE_ARGS+=--enable-nautilus=no .endif .if ${PORT_OPTIONS:MLIBBURNIA} -LIB_DEPENDS+= burn.4:${PORTSDIR}/devel/libburn \ - isofs.6:${PORTSDIR}/devel/libisofs +LIB_DEPENDS+= burn:${PORTSDIR}/devel/libburn \ + isofs:${PORTSDIR}/devel/libisofs CONFIGURE_ARGS+=--enable-libburnia PLIST_SUB+= LIBBURNIA="" .else diff --git a/sysutils/brasero3/pkg-plist b/sysutils/brasero3/pkg-plist index 4f9357e65..eacc5ac01 100644 --- a/sysutils/brasero3/pkg-plist +++ b/sysutils/brasero3/pkg-plist @@ -876,7 +876,3 @@ share/mime/packages/brasero.xml @dirrm lib/brasero3/plugins @dirrm lib/brasero3 @dirrm include/brasero3 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile index 0a6167a95..ff8f72c80 100644 --- a/sysutils/cinnamon-control-center/Makefile +++ b/sysutils/cinnamon-control-center/Makefile @@ -39,9 +39,8 @@ GH_TAGNAME= 1.7.1 GH_COMMIT= a3883df USE_XORG= x11 xfixes sm -USE_GETTEXT= yes +USES= gettext pathfix USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \ gnomedesktop3 evolutiondataserver3 USE_LDCONFIG= yes diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index ce4435e29..fa4d99efa 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ConsoleKit -# Date Created: 26 Aug 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/consolekit/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= consolekit PORTVERSION= 0.4.5 @@ -14,14 +10,13 @@ DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for defining and tracking users -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XORG= x11 -USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile index 0d551cc0f..6be52ffc1 100644 --- a/sysutils/drwright/Makefile +++ b/sysutils/drwright/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: drwright -# Date Created: 26 Apr 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= drwright PORTVERSION= 3.2.5 @@ -13,14 +10,14 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 RSI prevention tool -LIB_DEPENDS= canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + notify:${PORTSDIR}/devel/libnotify USE_XZ= yes -USE_GNOME= gnomehack intlhack gtk30 gnomecontrolcenter3 +USE_GNOME= intlhack gtk30 gnomecontrolcenter3 USE_XORG= x11 xscrnsaver USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index cec2486bc..c436394ba 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gconf-editor -# Date created: 12 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gconf-editor/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gconf-editor PORTVERSION= 2.32.0 @@ -20,11 +16,11 @@ COMMENT= A gconf database editor for the GNOME 2 environment CONFLICTS= gconf-editor-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomedocutils +USE_GNOME= gnomeprefix intlhack libgnomeui gnomedocutils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile index 624564b39..ec5144d8d 100644 --- a/sysutils/gconf-editor3/Makefile +++ b/sysutils/gconf-editor3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gconf-editor -# Date created: 12 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gconf-editor3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gconf-editor PORTVERSION= 3.0.1 @@ -19,11 +15,11 @@ CONFLICTS= gconf-editor-2.[0-9]* LATEST_LINK= gconf-editor3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk30 gconf2 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gconf2 gnomedocutils GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 5112ff00c..26627274c 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomecontrolcenter2 -# Date created: 04 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-control-center/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-control-center PORTVERSION= 2.32.1 @@ -16,10 +12,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= canberra-gtk:${PORTSDIR}/audio/libcanberra \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon @@ -27,12 +23,12 @@ RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ CONFLICTS= gnome-control-center-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils shared-mime-info USE_GMAKE= yes USE_GSTREAMER= good WANT_GNOME= yes -USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \ - desktopfileutils libgnomekbd gnomedesktop librsvg2 gconf2 +USE_GNOME= gnomeprefix intlhack metacity gnomemenus \ + libgnomekbd gnomedesktop librsvg2 gconf2 USE_XORG= xscrnsaver GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -66,7 +62,4 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \ ${WRKSRC}/capplets/display/org.gnome.randr.policy.in -post-install: - @-update-desktop-database - .include <bsd.port.post.mk> diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 65d4d00b5..c23cc6cad 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -318,12 +318,6 @@ share/polkit-1/actions/org.gnome.randr.policy @dirrmtry share/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@comment not sure about this .. -@unexec rm -f %D/share/applications/mimeinfo.cache > /dev/null || /usr/bin/true -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile index 0871cbc2d..d42878b8d 100644 --- a/sysutils/gnome-control-center3/Makefile +++ b/sysutils/gnome-control-center3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomecontrolcenter2 -# Date created: 04 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-control-center3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-control-center PORTVERSION= 3.4.2 @@ -18,15 +14,15 @@ COMMENT= Control center for GNOME 3 project BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - upower-glib.1:${PORTSDIR}/sysutils/upower \ - colord.1:${PORTSDIR}/graphics/colord \ - goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \ - socialweb.0:${PORTSDIR}/www/libsocialweb \ - gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + xklavier:${PORTSDIR}/x11/libxklavier \ + upower-glib:${PORTSDIR}/sysutils/upower \ + colord:${PORTSDIR}/graphics/colord \ + goa-1.0:${PORTSDIR}/net/gnome-online-accounts \ + socialweb:${PORTSDIR}/www/libsocialweb \ + gtop-2.0:${PORTSDIR}/devel/libgtop \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ @@ -39,11 +35,11 @@ CONFLICTS= gnome-control-center-2.[0-9]* gnome-media-2.[0-9]* LATEST_LINK= gnome-control-center3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils shared-mime-info USE_GMAKE= yes WANT_GNOME= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libxml2 gnomemenus3 \ - libgnomekbd3 desktopfileutils gnomedesktop3 gconf2 +USE_GNOME= gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \ + libgnomekbd3 gnomedesktop3 gconf2 USE_XORG= xscrnsaver x11 xxf86misc kbproto xi GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -82,7 +78,4 @@ post-patch: @${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \ ${WRKSRC}/panels/Makefile.in -post-install: - @-update-desktop-database - .include <bsd.port.post.mk> diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile index 4e9fcf84b..17d79a401 100644 --- a/sysutils/gnome-power-manager3/Makefile +++ b/sysutils/gnome-power-manager3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-power-manager -# Date created: 03 May 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-power-manager3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-power-manager PORTVERSION= 3.4.0 @@ -20,11 +16,11 @@ LIB_DEPENDS= upower-glib.1:${PORTSDIR}/sysutils/upower \ CONFLICTS= gnome-power-manager-2.[0-9]* LATEST_LINK= gnome-power-manager3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_GMAKE= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gnomedocutils +USE_GNOME= gnomeprefix intlhack gtk30 gnomedocutils MAKE_JOBS_UNSAFE=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \ diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile index 7ececbc44..4934c19b4 100644 --- a/sysutils/gnome-settings-daemon3/Makefile +++ b/sysutils/gnome-settings-daemon3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-settings-daemon -# Date created: 14 Jan 2008 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-settings-daemon3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-settings-daemon PORTVERSION= 3.4.2 @@ -17,12 +13,12 @@ COMMENT= GNOME 3 settings daemon BUILD_DEPENDS= gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas -LIB_DEPENDS= canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ - colord.1:${PORTSDIR}/graphics/colord \ - pulse.0:${PORTSDIR}/audio/pulseaudio \ - gdbm.4:${PORTSDIR}/databases/gdbm \ - notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + colord:${PORTSDIR}/graphics/colord \ + pulse:${PORTSDIR}/audio/pulseaudio \ + gdbm:${PORTSDIR}/databases/gdbm \ + notify:${PORTSDIR}/devel/libnotify RUN_DEPENDS= gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas @@ -32,9 +28,8 @@ LATEST_LINK= gnome-settings-daemon3 USE_XORG= xxf86misc USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop3 libgnomekbd3 \ - gnomehier -USE_GETTEXT= yes +USE_GNOME= gnomeprefix intlhack gnomedesktop3 libgnomekbd3 gnomehier +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-gudev \ diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 0d43c030e..af1ff15e1 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomesystemmonitor -# Date created: 09 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-system-monitor/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-system-monitor PORTVERSION= 2.28.2 @@ -17,18 +13,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 system monitor program BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \ + gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= gnome-system-monitor-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ - librsvg2 +USE_GNOME= gnomeprefix intlhack libwnck gnomevfs2 gnomedocutils librsvg2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib -lutil diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile index 16c31ea20..8a449f1df 100644 --- a/sysutils/gnome-system-monitor3/Makefile +++ b/sysutils/gnome-system-monitor3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomesystemmonitor -# Date created: 09 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/gnome-system-monitor3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-system-monitor PORTVERSION= 3.4.1 @@ -16,19 +12,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 system monitor program BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \ - gtkmm-3.0:${PORTSDIR}/x11-toolkits/gtkmm30 +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= gnome-system-monitor-2.[0-9]* LATEST_LINK= gnome-system-monitor3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libwnck3 gnomedocutils \ - librsvg2 +USE_GNOME= gnomeprefix intlhack libwnck3 gnomedocutils librsvg2 gtkmm30 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile index a3279dc09..4a7b38fed 100644 --- a/sysutils/polkit-gnome/Makefile +++ b/sysutils/polkit-gnome/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/polkit-gnome/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= polkit-gnome PORTVERSION= 0.102 @@ -14,8 +14,9 @@ LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit USE_XZ= yes USE_GMAKE= yes +USES= gettext pathfix USE_GETTEXT= yes -USE_GNOME= gnomehack gnomeprefix gtk20 intlhack +USE_GNOME= gnomeprefix gtk20 intlhack GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 74e3a1d1b..0c570116e 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/sysutils/polkit/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= polkit PORTVERSION= 0.105 @@ -18,9 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i USE_GNOME= gnomehack glib20 intlhack gnomehier USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes -USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ --with-authfw=pam \ diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 8fc921228..306b59bfb 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: system-tools-backends -# Date created: 11 February 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/system-tools-backends/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= system-tools-backends PORTVERSION= 2.10.2 @@ -16,14 +12,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Backend system admin scripts for gnome-system-tools BUILD_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -USE_GNOME= gnomehack intlhack glib20 +USES= pathfix +USE_GNOME= intlhack glib20 GNU_CONFIGURE= yes USE_GNOME_SUBR= yes CONFIGURE_ARGS= --with-stb-group=wheel \ diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index fc9a55495..58f6ab269 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: DeviceKit-power -# Date Created: 30 December 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/sysutils/upower/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= upower PORTVERSION= 0.9.18 @@ -22,10 +18,10 @@ LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection -USE_GETTEXT= yes +USES= gettext pathfix USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_GNOME= intlhack ltverhack glib20 USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_PYTHON= yes diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index e7dfcc44d..ad1bbd660 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-doc-utils -# Date created: 11 November 2004 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-doc-utils PORTVERSION= 0.20.10 @@ -25,9 +21,8 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ USE_XZ= yes USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes -USE_GETTEXT= yes -USE_GNOME= gnomehier gnomehack libxslt intlhack -USE_PKGCONFIG= build +USES= gettext pathfix pkgconfig +USE_GNOME= gnomehier libxslt intlhack USE_PYTHON= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 869cef56a..f2e4c6a7c 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: gtk-doc -# Date created: 8 March 2001 -# Whom: fenner -# +# Created by: fenner # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/textproc/gtk-doc/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gtk-doc PORTVERSION= 1.18 @@ -32,8 +29,8 @@ USE_XZ= yes USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnomeprefix libxslt gnomedocutils -USE_PKGCONFIG= build +USES= pathfix pkgconfig +USE_GNOME= gnomeprefix libxslt gnomedocutils INSTALLS_OMF= yes CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index a91588c9c..d386a4afc 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: intltool -# Date created: 19th January 2001 -# Whom: Ade Lovett <ade@FreeBSD.org> -# +# Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/textproc/intltool/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= intltool PORTVERSION= 0.50.2 @@ -18,7 +15,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir="${PREFIX}/libdata" diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 9b0f8eb6b..4086aca4d 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: libxml2 -# Date created: 28 September 1998 -# Whom: Yukihiro Nakai <Nakai@technologist.com> -# +# Created by: Yukihiro Nakai <Nakai@technologist.com> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/textproc/libxml2/Makefile 17268 2013-04-01 05:13:11Z marcus $ # # WITHOUT_SCHEMA disable XML schema support # WITHOUT_THREADS disable threads support @@ -28,10 +25,8 @@ COMMENT?= XML parser library for GNOME USE_CSTD= gnu89 USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_ICONV= yes GNU_CONFIGURE= yes -USE_GNOME?= gnomehack -USE_PKGCONFIG= build +USES= iconv pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \ --with-html-dir=${PREFIX}/share/doc \ diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index cd4136816..018242cba 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: py-libxml2 -# Date created: 30 Jun 2004 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# +# Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTREVISION= 0 CATEGORIES= textproc gnome python @@ -18,7 +15,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomehack libxml2 +USES= pathfix +USE_GNOME= libxml2 USE_PYTHON= yes CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= `${PYTHON_VERSION}-config --libs` diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile index 3c9da00e0..5caa70974 100644 --- a/textproc/yelp-tools/Makefile +++ b/textproc/yelp-tools/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/textproc/yelp-tools/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= yelp-tools PORTVERSION= 3.4.1 @@ -14,11 +14,9 @@ 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 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_GMAKE= yes -USES= pathfix -USE_PKGCONFIG= build USE_GNOME= gnomeprefix intlhack libxml2 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile index 6256661ca..1598df90f 100644 --- a/textproc/yelp-xsl/Makefile +++ b/textproc/yelp-xsl/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/textproc/yelp-xsl/Makefile 17271 2013-04-01 15:16:27Z kwm $ PORTNAME= yelp-xsl PORTVERSION= 3.4.2 @@ -13,7 +13,6 @@ COMMENT= DocBook XSLT stylesheets for yelp BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -#USE_GETTEXT= yes USE_XZ= yes USE_GMAKE= yes USES= pathfix diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 23524d6db..198c4f055 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/www/epiphany-extensions/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= epiphany-extensions PORTVERSION= 2.30.2 @@ -19,9 +19,9 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany CONFLICTS= epiphany-extensions-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack intlhack +USE_GNOME= gnomeprefix intlhack INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/epiphany-extensions3/Makefile b/www/epiphany-extensions3/Makefile index 27f39fa55..8c64a77b7 100644 --- a/www/epiphany-extensions3/Makefile +++ b/www/epiphany-extensions3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/www/epiphany-extensions3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= epiphany-extensions PORTVERSION= 3.4.0 @@ -20,9 +20,9 @@ RUN_DEPENDS= epiphany>=3.4.0:${PORTSDIR}/www/epiphany3 CONFLICTS= epiphany-extensions-2.[0-9]* LATEST_LINK= epiphany-extensions3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes -USE_GNOME= gnomeprefix gnomehack intlhack +USE_GNOME= gnomeprefix intlhack INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile index 13648d15f..a9de90883 100644 --- a/www/epiphany3/Makefile +++ b/www/epiphany3/Makefile @@ -1,10 +1,6 @@ -# Ports collection Makefile for: epiphany -# Date created: 24 April 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/www/epiphany3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= epiphany PORTVERSION= 3.4.3 @@ -19,11 +15,11 @@ COMMENT?= An extremely lightweight and simple web browser for GNOME 3 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -LIB_DEPENDS= webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ - startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - notify.4:${PORTSDIR}/devel/libnotify \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +LIB_DEPENDS= webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ + startup-notification-1:${PORTSDIR}/x11/startup-notification \ + notify:${PORTSDIR}/devel/libnotify \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ @@ -35,12 +31,11 @@ CONFLICTS= epiphany-2.[0-9]* LATEST_LINK= epiphany3 USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig desktop-file-utils USE_XZ= yes USE_PYTHON= yes USE_SQLITE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils libxml2 \ - desktopfileutils +USE_GNOME= gnomeprefix intlhack gnomedocutils libxml2 USE_XORG= ice x11 sm GNU_CONFIGURE= yes USE_GMAKE= yes @@ -78,20 +73,20 @@ CONFIGURE_ARGS+= --enable-compile-warnings=no .endif .if defined(WITH_NSS) -LIB_DEPENDS+= nss3.1:${PORTSDIR}/security/nss +LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss CONFIGURE_ARGS+=--enable-nss .else CONFIGURE_ARGS+=--disable-nss .endif .if defined(WITH_AVAHI) -LIB_DEPENDS+= avahi-gobject.0:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= avahi-gobject:${PORTSDIR}/net/avahi-app .else CONFIGURE_ARGS+=--disable-zeroconf .endif .if defined(WITH_SEED) -LIB_DEPENDS+= seed-gtk3.0:${PORTSDIR}/devel/seed3 +LIB_DEPENDS+= seed-gtk3:${PORTSDIR}/devel/seed3 CONFIGURE_ARGS+=--enable-seed .endif @@ -106,7 +101,4 @@ post-patch: s|-ldl"$$|"|g' \ ${WRKSRC}/configure -post-install: - @-update-desktop-database - .include <bsd.port.post.mk> diff --git a/www/epiphany3/pkg-plist b/www/epiphany3/pkg-plist index b1d3f02a0..080f5ef34 100644 --- a/www/epiphany3/pkg-plist +++ b/www/epiphany3/pkg-plist @@ -337,8 +337,6 @@ share/omf/epiphany/epiphany-zh_CN.omf @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany @dirrm include/epiphany/%%EPHY_VERSION%% @dirrm include/epiphany -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yo/LC_MESSAGES diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile index 40847006d..46918754e 100644 --- a/www/gtkhtml4/Makefile +++ b/www/gtkhtml4/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtkhtml3 -# Date created: 12 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/www/gtkhtml4/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gtkhtml PORTVERSION= 4.4.4 @@ -18,16 +14,16 @@ COMMENT= Lightweight HTML rendering/printing/editing engine BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ - enchant.1:${PORTSDIR}/textproc/enchant +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ + enchant:${PORTSDIR}/textproc/enchant RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage xproto USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gconf2 ltverhack +USE_GNOME= gnomeprefix intlhack gtk30 gconf2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/www/libepc/Makefile b/www/libepc/Makefile index d99e11c24..7c5707a96 100644 --- a/www/libepc/Makefile +++ b/www/libepc/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libepc -# Date created: 24 Mar 2008 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= libepc PORTVERSION= 0.4.4 @@ -14,15 +10,15 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= The Easy Publish and Consume library -LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \ - soup-2.4.1:${PORTSDIR}/devel/libsoup \ - gnutls.47:${PORTSDIR}/security/gnutls \ - avahi-ui-gtk3.0:${PORTSDIR}/net/avahi-gtk3 +LIB_DEPENDS= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ + soup-2.4:${PORTSDIR}/devel/libsoup \ + gnutls:${PORTSDIR}/security/gnutls \ + avahi-ui-gtk3:${PORTSDIR}/net/avahi-gtk3 USE_XZ= yes USE_GMAKE= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack gtk30 +USES= gettext pathfix pkgconfig +USE_GNOME= gnomeprefix gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/www/libsocialweb/Makefile b/www/libsocialweb/Makefile index a1c8675a3..7945a767a 100644 --- a/www/libsocialweb/Makefile +++ b/www/libsocialweb/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: libsocialweb -# Date Created: 19 Feb 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= libsocialweb PORTVERSION= 0.25.20 @@ -14,15 +11,15 @@ MAINTAINER= kwm@FreeBSD.org COMMENT= A personal social data server. BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= rest-0.7.0:${PORTSDIR}/www/rest \ - json-glib-1.0.0:${PORTSDIR}/devel/json-glib +LIB_DEPENDS= rest-0.7:${PORTSDIR}/www/rest \ + json-glib-1.0:${PORTSDIR}/devel/json-glib -USE_GNOME= gnomehack glib20 intlhack gconf2 +USE_GNOME= glib20 intlhack gconf2 USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GETTEXT= yes +USES= gettext pathfix CONFIGURE_ARGS= --enable-all-services .include <bsd.port.mk> diff --git a/www/rest/Makefile b/www/rest/Makefile index a6df39731..75db10a70 100644 --- a/www/rest/Makefile +++ b/www/rest/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: -# Date Created: -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= rest PORTVERSION= 0.7.12 @@ -15,10 +12,11 @@ COMMENT= "RESTful" state website access web services BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome +LIB_DEPENDS= soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -USE_GNOME= gnomehack glib20 intlhack libxml2 +USES= pathfix +USE_GNOME= glib20 intlhack libxml2 USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 41fcf295e..a1af35a2f 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/www/webkit-gtk2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= webkit PORTVERSION= 1.8.3 @@ -21,11 +21,10 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ soup-2.4:${PORTSDIR}/devel/libsoup USE_XZ= yes -USE_GETTEXT= yes USE_GSTREAMER= yes MAKE_JOBS_SAFE= yes USE_XORG= xt -USES= bison +USES= bison gettext pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gtk20 libxslt ltverhack diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index ed81a0fbe..3ef54052e 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/www/webkit-gtk3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= webkit PORTVERSION= 1.8.3 @@ -21,11 +21,10 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ soup-2.4:${PORTSDIR}/devel/libsoup USE_XZ= yes -USE_GETTEXT= yes USE_GSTREAMER= yes MAKE_JOBS_SAFE= yes USE_XORG= xt -USES= bison +USES= bison gettext pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gtk30 libxslt ltverhack diff --git a/x11-fm/nautilus3/Makefile b/x11-fm/nautilus3/Makefile index a7b126a1e..ac0cad410 100644 --- a/x11-fm/nautilus3/Makefile +++ b/x11-fm/nautilus3/Makefile @@ -1,10 +1,5 @@ -# New ports collection makefile for: nautilus2 -# Date created: 28th August 2000 -# Whom: ade, archie -# # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-fm/nautilus3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= nautilus PORTVERSION= 3.4.2 @@ -18,9 +13,9 @@ COMMENT= File manager for the GNOME desktop BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ - notify.4:${PORTSDIR}/devel/libnotify \ - exempi.3:${PORTSDIR}/textproc/exempi +LIB_DEPENDS= exif:${PORTSDIR}/graphics/libexif \ + notify:${PORTSDIR}/devel/libnotify \ + exempi:${PORTSDIR}/textproc/exempi RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas @@ -30,9 +25,9 @@ LATEST_LINK= nautilus3 INSTALLS_ICONS= yes USE_XZ= yes USE_GMAKE= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop3 libxml2 \ - desktopfileutils ltverhack gvfs ltasneededhack +USES= gettext pathfix desktop-file-utils shared-mime-info +USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 \ + ltverhack gvfs ltasneededhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include @@ -44,7 +39,4 @@ GLIB_SCHEMAS= org.gnome.nautilus.gschema.xml MAN1= nautilus-connect-server.1 nautilus.1 -post-install: - @-update-desktop-database - .include <bsd.port.mk> diff --git a/x11-fm/nautilus3/pkg-plist b/x11-fm/nautilus3/pkg-plist index 641689aeb..91735b3c6 100644 --- a/x11-fm/nautilus3/pkg-plist +++ b/x11-fm/nautilus3/pkg-plist @@ -186,10 +186,6 @@ share/mime/packages/nautilus.xml @dirrmtry lib/nautilus @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrm share/doc/libnautilus-extension @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 9396e3ae6..3751ebc43 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -27,9 +27,8 @@ GH_COMMIT= 63f7b44 INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GETTEXT= yes -USES= pathfix -USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 desktopfileutils +USES= gettext pathfix desktop-file-utils +USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool autoconf automake CPPFLAGS+= -I${LOCALBASE}/include @@ -59,7 +58,4 @@ post-patch: pre-configure: cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh -post-install: - @-update-desktop-database - .include <bsd.port.mk> diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index e5de60676..9bdff1ea3 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-backgrounds -# Date Created: 12 January 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-themes/gnome-backgrounds/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-backgrounds PORTVERSION= 3.4.2 @@ -16,10 +12,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A collection of backgrounds for GNOME USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack +USE_GNOME= gnomeprefix intlhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-themes/gnome-themes-standard/Makefile b/x11-themes/gnome-themes-standard/Makefile index af10dd48b..6f9718522 100644 --- a/x11-themes/gnome-themes-standard/Makefile +++ b/x11-themes/gnome-themes-standard/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-themes/gnome-themes-standard/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-themes-standard PORTVERSION= 3.6.0.2 @@ -14,10 +14,10 @@ COMMENT= Standard themes for GNOME CONFLICTS= gnome-themes-2.[0-9]* USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack gtk30 librsvg2 +USE_GNOME= gnomeprefix intlhack gtk30 librsvg2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 742f8bbdc..54828cefd 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-themes -# Date Created: 05 October 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-themes/gnome-themes/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-themes PORTVERSION= 2.32.1 @@ -22,11 +18,11 @@ RUN_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 CONFLICTS= clearlooks-metacity-0.* gnome-themes-standard-3.[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20 +USE_GNOME= gnomeprefix intlhack metacity gtk20 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-themes/gtk-engines3/Makefile b/x11-themes/gtk-engines3/Makefile index 69cb64f42..ce2d437e9 100644 --- a/x11-themes/gtk-engines3/Makefile +++ b/x11-themes/gtk-engines3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtk-engines2 -# Date Created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-themes/gtk-engines3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gtk-engines3 PORTVERSION= 2.91.1 @@ -18,14 +14,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Theme engine for the GTK+-3.0 toolkit LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomehack gtk30 intlhack ltasneededhack -USE_GETTEXT= yes +USE_GNOME= gtk30 intlhack ltasneededhack +USES= gettext pathfix USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= ANIMATION "Enable animated progressbars" off diff --git a/x11-themes/gtk-theme-engine-clearlooks/Makefile b/x11-themes/gtk-theme-engine-clearlooks/Makefile index 337b2c302..aa6fb592e 100644 --- a/x11-themes/gtk-theme-engine-clearlooks/Makefile +++ b/x11-themes/gtk-theme-engine-clearlooks/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtk-theme-engine-clearlooks -# Date Created: 28 Dec 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= gtk-theme-engine-clearlooks PORTVERSION= 2.91.5 @@ -18,13 +14,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Clearlooks theme engine LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomehack gtk30 intlhack -USE_GETTEXT= yes +USE_GNOME= gtk30 intlhack +USES= gettext pathfix GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> 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 <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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 <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $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 <marcus@FreeBSD.org> # $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 <marcus@FreeBSD.org> # $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 <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $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 <sobomax@FreeBSD.org> # $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 <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $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 <marcus@FreeBSD.org> # $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 <bsd.port.pre.mk> +.include <bsd.port.options.mk> .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 <bsd.port.post.mk> +.include <bsd.port.mk> .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 <marcus@FreeBSD.org> # $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 <bsd.port.pre.mk> +.include <bsd.port.options.mk> .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 <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 4b0119fb8..eb1c72c28 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: metacity -# Date created: 21 May 2002 -# Whom: Garrett Rooney <rooneg@electricjellyfish.net> -# +# Created by: Garrett Rooney <rooneg@electricjellyfish.net> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11-wm/metacity/Makefile 17269 2013-04-01 05:13:48Z marcus $ PORTNAME= metacity PORTVERSION= 2.30.3 @@ -17,18 +13,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A window manager for the adult in you BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity CONFLICTS= metacity-2.3[4-9]* USE_BZIP2= yes USE_XORG= x11 xcomposite xdamage -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 +USE_GNOME= gnomeprefix intlhack gconf2 ltverhack gtk20 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-wm/metacity3/Makefile b/x11-wm/metacity3/Makefile index bd89f5629..3b186bb90 100644 --- a/x11-wm/metacity3/Makefile +++ b/x11-wm/metacity3/Makefile @@ -1,6 +1,6 @@ # Created by: Garrett Rooney <rooneg@electricjellyfish.net> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-wm/metacity3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= metacity PORTVERSION= 2.34.13 @@ -26,10 +26,10 @@ CONFLICTS= metacity-2.30.[0-9]* LATEST_LINK= metacity3 USE_XZ= yes USE_XORG= x11 xcomposite xdamage xrender xcursor xinerama xext xrandr -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix intlhack gnomehack ltverhack gtk20 +USE_GNOME= gnomeprefix intlhack ltverhack gtk20 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile index 9a396ddc8..0ddf09ca5 100644 --- a/x11-wm/muffin/Makefile +++ b/x11-wm/muffin/Makefile @@ -26,10 +26,9 @@ GH_COMMIT= 4b36a9a USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm USE_PYTHON= 2.5+ -USE_GETTEXT= yes +USES= gettext pathfix USE_GMAKE= yes USE_AUTOTOOLS= libtool autoconf automake -USES= pathfix USE_GNOME= gnomehier gnomeprefix intlhack gtk30 gconf2 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index 876e3426f..d00f28935 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -1,6 +1,6 @@ # Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11-wm/mutter/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= mutter PORTVERSION= 3.4.1 @@ -25,11 +25,9 @@ USE_XZ= yes USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \ xrender xdamage USE_PYTHON= 2.5+ -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_PKGCONFIG= build -USES= pathfix USE_GNOME= gnomehier gnomeprefix intlhack gtk30 ltverhack USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index e9774746f..16033a75c 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -37,10 +37,9 @@ GH_COMMIT= 941456a WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-Cinnamon-${GH_COMMIT} USE_XORG= x11 xfixes sm -USE_GETTEXT= yes +USES= gettext pathfix USE_GMAKE= yes USE_AUTOTOOLS= libtool autoconf automake -USES= pathfix USE_GNOME= gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \ gnomedesktop3 evolutiondataserver3 pygnome2 USE_GSTREAMER= theora vp8 ogg diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ace0a2029..8da193150 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gdm2 -# Date created: 20 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gdm/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gdm PORTVERSION= 2.30.7 @@ -18,12 +14,12 @@ COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ - polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ +LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \ + polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - upower-glib.1:${PORTSDIR}/sysutils/upower \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra + upower-glib:${PORTSDIR}/sysutils/upower \ + xklavier:${PORTSDIR}/x11/libxklavier \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session \ @@ -35,14 +31,14 @@ USERS= gdm GROUPS= gdm USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ +USE_GNOME= intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes @@ -63,12 +59,12 @@ GNOME_LOCALSTATEDIR= /var OPTIONS= IPV6 "Enable IPv6 support" off \ KEYRING "Enable GnomeKeyring/PAM integration" on -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITHOUT_KEYRING) SUB_LIST+= PAM_KEYRING=\# .else -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring SUB_LIST+= PAM_KEYRING= .endif @@ -108,4 +104,4 @@ post-install: | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index cc339ad2e..c7aeb320a 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gdm2 -# Date created: 20 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gdm3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gdm PORTVERSION= 3.4.1 @@ -19,16 +15,15 @@ COMMENT= GNOME 3 version of xdm display manager BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \ nss-config:${PORTSDIR}/security/nss \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ - dconf.0:${PORTSDIR}/devel/dconf \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ +LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - upower-glib.1:${PORTSDIR}/sysutils/upower \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - accountsservice.0:${PORTSDIR}/sysutils/accountsservice \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 + upower-glib:${PORTSDIR}/sysutils/upower \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + accountsservice:${PORTSDIR}/sysutils/accountsservice \ + xklavier:${PORTSDIR}/x11/libxklavier \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ nss-config:${PORTSDIR}/security/nss \ @@ -44,7 +39,7 @@ GROUPS= gdm LATEST_LINK= gdm3 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_OMF= yes @@ -52,7 +47,7 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 +USE_GNOME= intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ @@ -60,8 +55,8 @@ CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ --enable-authentication-scheme=pam \ --with-console-kit \ --with-systemd=no -CPPFLAGS= -I${LOCALBASE}/include -DHAS_SA_LEN -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN +LDFLAGS+= -L${LOCALBASE}/lib CONFIGLIBS= -lm -lexecinfo CONFIGURE_ENV= LIBS="${CONFIGLIBS}" \ GTKDOC="false" @@ -129,11 +124,9 @@ post-install: @dconf update @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - # logwtmp lives here. .if ${OSVERSION} < 900000 CONFIGLIBS+= -lutil .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index f28eb1cc9..7595faf7e 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11/gnome-desktop/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-desktop PORTVERSION= 2.32.1 @@ -16,13 +16,12 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification USE_XORG= xpm -USES= bison pathfix +USES= bison gettext pathfix pkgconfig USE_GNOME= gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \ ltverhack referencehack -USE_GETTEXT= yes USE_GMAKE= yes USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile index 2818c131d..87d4e1f46 100644 --- a/x11/gnome-desktop3/Makefile +++ b/x11/gnome-desktop3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11/gnome-desktop3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-desktop PORTVERSION= 3.4.2 @@ -26,9 +26,8 @@ LATEST_LINK= gnome-desktop3 USE_XORG= x11 xrandr xext USE_GNOME= gnomeprefix intlhack gnomedocutils gtk30 \ ltverhack referencehack -USE_GETTEXT= yes USE_GMAKE= yes -USES= bison pathfix +USES= bison gettext pathfix USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index f0daac6cd..50cc69db5 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11/gnome-menus/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-menus PORTVERSION= 2.30.5 @@ -16,12 +16,10 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection CONFLICTS= gnome-menus-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_BZIP2= yes USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomehier gnomeprefix intlhack glib20 ltverhack -USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile index edf8759bd..c3d021e7c 100644 --- a/x11/gnome-menus3/Makefile +++ b/x11/gnome-menus3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/x11/gnome-menus3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-menus PORTVERSION= 3.4.2 @@ -16,12 +16,10 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection CONFLICTS= gnome-menus-2.[0-9]* LATEST_LINK= gnome-menus3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_GMAKE= yes -USES= pathfix USE_GNOME= gnomehier gnomeprefix intlhack glib20 ltverhack -USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 53dedd847..7f0305479 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomepanel -# Date created: 27 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-panel/Makefile 18392 2013-04-26 11:23:16Z mezz $ PORTNAME= gnome-panel PORTVERSION= 2.32.1 @@ -21,18 +17,18 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + canberra-gtk:${PORTSDIR}/audio/libcanberra CONFLICTS= gnome-panel-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix USE_XORG= ice sm x11 xau xrandr USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \ +USE_GNOME= gnomeprefix intlhack gnomedesktop libwnck gnomemenus \ gnomedocutils ltverhack referencehack librsvg2 WANT_GNOME= yes USE_GMAKE= yes diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile index bbef9d056..ce2a1dbcb 100644 --- a/x11/gnome-panel3/Makefile +++ b/x11/gnome-panel3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomepanel -# Date created: 27 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-panel3/Makefile 18392 2013-04-26 11:23:16Z mezz $ PORTNAME= gnome-panel PORTVERSION= 3.4.2.1 @@ -21,20 +17,20 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather-3.0:${PORTSDIR}/net/libgweather3 \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ - polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon CONFLICTS= gnome-panel-2.[0-9]* LATEST_LINK= gnome-panel3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XORG= ice sm x11 xau xrandr INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop3 librsvg2 libwnck3 \ +USE_GNOME= gnomeprefix intlhack gnomedesktop3 librsvg2 libwnck3 \ gnomemenus3 gnomedocutils ltverhack referencehack WANT_GNOME= yes USE_GMAKE= yes diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 16e28c4cc..73b8ac6e1 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-screensaver -# Date created: 09 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-screensaver/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-screensaver PORTVERSION= 2.30.2 @@ -16,18 +12,17 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks CONFLICTS= gnome-screensaver-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes USE_XORG= xtst xxf86vm -USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \ - gnomedesktop +USE_GNOME= gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile index 22570cf3e..03b3e3141 100644 --- a/x11/gnome-screensaver3/Makefile +++ b/x11/gnome-screensaver3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-screensaver -# Date created: 09 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-screensaver3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-screensaver PORTVERSION= 3.4.4 @@ -27,10 +23,10 @@ CONFLICTS= gnome-screensaver-2.[0-9]* LATEST_LINK= gnome-screensaver3 USE_XZ= yes USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver -USE_GNOME= gnomeprefix gnomehack intlhack libgnomekbd3 gnomedesktop3 +USE_GNOME= gnomeprefix intlhack libgnomekbd3 gnomedesktop3 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-pam-prefix=${PREFIX}/etc/pam.d \ diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index f6e751c92..b3d0841e4 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomesession -# Date created: 08 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-session/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-session PORTVERSION= 2.32.1 @@ -19,20 +15,20 @@ COMMENT= Session component for the GNOME 2 desktop CONFLICTS= gnome-session-3.[0-9]* BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ - notify.4:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring \ + notify:${PORTSDIR}/devel/libnotify \ execinfo:${PORTSDIR}/devel/libexecinfo \ - upower-glib.1:${PORTSDIR}/sysutils/upower + upower-glib:${PORTSDIR}/sysutils/upower RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_BZIP2= yes USE_XORG= ice sm xau xrandr -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 +USE_GNOME= gnomeprefix intlhack gconf2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docbook-docs diff --git a/x11/gnome-session3/Makefile b/x11/gnome-session3/Makefile index 95eaedd6b..9f9c9cb1c 100644 --- a/x11/gnome-session3/Makefile +++ b/x11/gnome-session3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnomesession -# Date created: 08 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-session3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-session PORTVERSION= 3.4.2.1 @@ -26,11 +22,11 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consoleki LATEST_LINK= gnome-session3 INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_XORG= ice sm xau xext xtst xrender xtrans xcomposite USE_GL= gl -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool gtk30 librsvg2 +USE_GNOME= gnomeprefix intlhack gconf2 intltool gtk30 librsvg2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docbook-docs diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile index a5d7d68b1..5483d3737 100644 --- a/x11/gnome-shell-extensions/Makefile +++ b/x11/gnome-shell-extensions/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-shell-extensions -# Date created: 21 May 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom$ -# PORTNAME= gnome-shell-extensions PORTVERSION= 3.2.0 @@ -15,12 +11,12 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME desktop shell extensions -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop RUN_DEPENDS= gnome-shell>=3.2.0:${PORTSDIR}/x11/gnome-shell USE_XZ= yes -USE_GETTEXT= yes -USE_GNOME= intltool gnomehack glib20 gnomedesktop3 +USES= gettext pathfix +USE_GNOME= intltool glib20 gnomedesktop3 USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index c5043be67..5392299e0 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-shell -# Date created: 14 Aug 2009 -# Whom: Pawel Worach <pawel.worach@gmail.com> -# +# Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-shell/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-shell PORTVERSION= 3.4.2 @@ -17,28 +13,28 @@ COMMENT= Next generation GNOME desktop shell BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ gcr>=3.4.1:${PORTSDIR}/security/gcr -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - caribou.0:${PORTSDIR}/accessibility/caribou \ - mutter.0:${PORTSDIR}/x11-wm/mutter \ +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \ + caribou:${PORTSDIR}/accessibility/caribou \ + mutter:${PORTSDIR}/x11-wm/mutter \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring \ gcr:${PORTSDIR}/security/gcr \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \ - folks.25:${PORTSDIR}/net-im/folks \ - pulse.0:${PORTSDIR}/audio/pulseaudio \ - croco-0.6.3:${PORTSDIR}/textproc/libcroco \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \ + folks:${PORTSDIR}/net-im/folks \ + pulse:${PORTSDIR}/audio/pulseaudio \ + croco-0.6:${PORTSDIR}/textproc/libcroco \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ clutter-1.0:${PORTSDIR}/graphics/clutter \ - gjs.0:${PORTSDIR}/lang/gjs + gjs:${PORTSDIR}/lang/gjs RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USE_XZ= yes USE_XORG= x11 xfixes sm -USE_GETTEXT= yes +USES= gettext pathfix USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 gnomemenus3 \ +USE_GNOME= gnomeprefix intlhack gtk30 gnomemenus3 \ gnomedesktop3 evolutiondataserver3 ltverhack USE_GSTREAMER= theora vp8 ogg USE_LDCONFIG= yes diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index a6071f92b..34646160d 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnometerminal -# Date created: 1 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-terminal/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-terminal PORTVERSION= 2.32.1 @@ -16,17 +12,16 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification CONFLICTS= gnome-terminal-3.[0-9]* -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_BZIP2= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_XORG= sm -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \ - libgnome +USE_GNOME= gnomeprefix intlhack gconf2 vte gnomedocutils libgnome GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/gnome-terminal3/Makefile b/x11/gnome-terminal3/Makefile index da5579d72..231949c2e 100644 --- a/x11/gnome-terminal3/Makefile +++ b/x11/gnome-terminal3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnometerminal -# Date created: 1 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome-terminal3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome-terminal PORTVERSION= 3.4.1.1 @@ -18,16 +14,16 @@ COMMENT= Terminal component for the GNOME 3 Desktop CONFLICTS= gnome-terminal-2.[0-9]* BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas LATEST_LINK= gnome-terminal3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_XORG= sm ice -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte3 gnomedocutils +USE_GNOME= gnomeprefix intlhack gconf2 vte3 gnomedocutils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 987f63b2e..0ecf1d37b 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2-lite -# Date created: 30 November 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome2-lite/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= x11 gnome diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 8b6ab47cf..89157d704 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome2/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome2 PORTVERSION= 2.32.1 diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile index ff22926ec..fc4b7a307 100644 --- a/x11/gnome3-lite/Makefile +++ b/x11/gnome3-lite/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2-lite -# Date created: 30 November 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome3-lite/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTREVISION= 0 CATEGORIES= x11 gnome @@ -19,6 +15,3 @@ DESCR= ${.CURDIR}/pkg-descr PKGMESSAGE= ${.CURDIR}/pkg-message .include "${MASTERDIR}/Makefile" - - - diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile index daea92775..c36fefacc 100644 --- a/x11/gnome3/Makefile +++ b/x11/gnome3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/gnome3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= gnome3 PORTVERSION= 3.4.0 diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 18347a851..0e54f60eb 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgnomekbd -# Date created: 2006-11-07 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/libgnomekbd/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgnomekbd PORTVERSION= 2.32.0 @@ -16,15 +12,15 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyboard shared library -LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier:${PORTSDIR}/x11/libxklavier CONFLICTS= libgnomekbd-3.[0-9]* USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 +USE_GNOME= gnomeprefix ltverhack gconf2 USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix USE_LDCONFIG= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -32,8 +28,4 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas -#post-patch: -# @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ -# 's|-Werror||g' - .include <bsd.port.mk> diff --git a/x11/libgnomekbd3/Makefile b/x11/libgnomekbd3/Makefile index 8ec7d5d6a..6a502f59c 100644 --- a/x11/libgnomekbd3/Makefile +++ b/x11/libgnomekbd3/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgnomekbd -# Date created: 2006-11-07 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/libgnomekbd3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libgnomekbd PORTVERSION= 3.4.0.2 @@ -16,18 +12,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyboard shared library BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier:${PORTSDIR}/x11/libxklavier LATEST_LINK= libgnomekbd3 CONFLICTS= libgnomekbd-2.[0-9]* USE_XZ= yes -USE_GNOME= gnomeprefix gnomehack ltverhack intltool gtk30 +USE_GNOME= gnomeprefix ltverhack intltool gtk30 USE_AUTOTOOLS= libtool USE_XORG= ice INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 3bd2f11af..9d19f1762 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libxklavier -# Date created: 31 May 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/x11/libxklavier/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= libxklavier PORTVERSION= 5.2.1 @@ -23,7 +19,8 @@ RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \ USE_XORG= x11 xkbfile USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack libxml2 glib20 ltverhack:12 +USES= pathfix +USE_GNOME= libxml2 glib20 ltverhack:12 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/yelp3/Makefile b/x11/yelp3/Makefile index 32059664e..3c931ef05 100644 --- a/x11/yelp3/Makefile +++ b/x11/yelp3/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$ -# +# $MCom: ports/trunk/x11/yelp3/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= yelp PORTVERSION= 3.4.2 @@ -26,11 +22,11 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/yelp-xsl.pc:${PORTSDIR}/textproc/yel CONFLICTS= yelp-2.[0-9]* LATEST_LINK= yelp3 -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig USE_XZ= yes USE_XORG= x11 ice USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk30 libxslt libxml2 +USE_GNOME= gnomeprefix intlhack gtk30 libxslt libxml2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 9ab4e2d62..8f666d3ea 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -16,15 +16,14 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk20 gnomedocutils intlhack +USE_GNOME= gnomeprefix gtk20 gnomedocutils intlhack USE_BZIP2= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes INSTALLS_OMF= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -lintl -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= LIBS="-lintl ${PTHREAD_LIBS}" MAN1= zenity.1 @@ -35,8 +34,8 @@ OPTIONS_DEFAULT=NOTIFY .include <bsd.port.options.mk> -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile index b1e9f46ce..d5a59867a 100644 --- a/x11/zenity3/Makefile +++ b/x11/zenity3/Makefile @@ -16,10 +16,10 @@ LICENSE= LGPL20 LATEST_LINK= zenity3 USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk30 gnomedocutils intlhack +USE_GNOME= gnomeprefix gtk30 gnomedocutils intlhack USE_XORG= x11 USE_XZ= yes -USE_GETTEXT= yes +USES= gettext pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib @@ -36,7 +36,7 @@ OPTIONS_DEFAULT=NOTIFY .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify |