diff options
-rw-r--r-- | security/gnome-keyring/Makefile | 1 | ||||
-rw-r--r-- | textproc/gtk-doc/Makefile | 6 | ||||
-rw-r--r-- | textproc/yelp-tools/Makefile | 5 | ||||
-rw-r--r-- | textproc/yelp-xsl/Makefile | 5 | ||||
-rw-r--r-- | www/gtkhtml4/Makefile | 5 | ||||
-rw-r--r-- | www/gtkhtml4/pkg-plist | 2 | ||||
-rw-r--r-- | www/libepc/Makefile | 3 | ||||
-rw-r--r-- | x11-themes/gnome-backgrounds/Makefile | 3 | ||||
-rw-r--r-- | x11-themes/gnome-icon-theme-symbolic/Makefile | 3 | ||||
-rw-r--r-- | x11-themes/gtk-theme-engine-clearlooks/Makefile | 7 | ||||
-rw-r--r-- | x11-toolkits/gtkmm30/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtkmm30/pkg-plist | 2 | ||||
-rw-r--r-- | x11-wm/mutter/Makefile | 8 | ||||
-rw-r--r-- | x11-wm/mutter/pkg-plist | 4 | ||||
-rw-r--r-- | x11/gnome-shell-extensions/Makefile | 3 | ||||
-rw-r--r-- | x11/zenity/Makefile | 12 | ||||
-rw-r--r-- | x11/zenity/pkg-plist | 1 | ||||
-rw-r--r-- | x11/zenity3/Makefile | 13 | ||||
-rw-r--r-- | x11/zenity3/pkg-plist | 1 |
19 files changed, 32 insertions, 60 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index a8fa342a1..daec9b2f2 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro CONFLICTS= gnome-keyring-3.[0-9]* gcr-3.[0-9]* -NO_STAGE FUCK YEAH! USE_BZIP2= yes USE_GNOME= gnomeprefix gtk20 ltverhack intlhack USES= gettext gmake pathfix pkgconfig diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index d2517e6ea..8eb0f16f1 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,6 +1,6 @@ # Created by: fenner # $FreeBSD$ -# $MCom: ports/trunk/textproc/gtk-doc/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gtk-doc PORTVERSION= 1.18 @@ -25,7 +25,6 @@ CATALOG_DIR= ${PREFIX}/share/sgml/${PORTNAME} XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -NO_STAGE= yes USE_XZ= yes GNU_CONFIGURE= yes USES= gmake pathfix perl5 pkgconfig @@ -37,7 +36,4 @@ PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \ CATALOG_DIR=${CATALOG_DIR} -post-install: - -@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat - .include <bsd.port.mk> diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile index fbe42f978..db6fe35fc 100644 --- a/textproc/yelp-tools/Makefile +++ b/textproc/yelp-tools/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/textproc/yelp-tools/Makefile 18487 2013-05-17 21:30:13Z kwm $ +# $MCom$ PORTNAME= yelp-tools PORTVERSION= 3.6.1 @@ -14,12 +14,11 @@ 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 -NO_STAGE= yes USES= gettext gmake pathfix pkgconfig USE_XZ= yes USE_GNOME= gnomeprefix intlhack libxml2 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile index 0665c4a40..dcf026718 100644 --- a/textproc/yelp-xsl/Makefile +++ b/textproc/yelp-xsl/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/textproc/yelp-xsl/Makefile 18500 2013-05-26 22:35:07Z kwm $ +# $MCom$ PORTNAME= yelp-xsl PORTVERSION= 3.6.1 @@ -13,12 +13,11 @@ COMMENT= DocBook XSLT stylesheets for yelp BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomeprefix intlhack libxml2 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile index 9d40c8f19..b898bf2f1 100644 --- a/www/gtkhtml4/Makefile +++ b/www/gtkhtml4/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/www/gtkhtml4/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gtkhtml PORTVERSION= 4.6.6 @@ -19,13 +19,12 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -NO_STAGE= yes USES= gettext gmake pathfix pkgconfig USE_XZ= yes USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage xproto USE_GNOME= gnomeprefix intlhack gtk30 ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/www/gtkhtml4/pkg-plist b/www/gtkhtml4/pkg-plist index 0b7f04f67..e2807f14f 100644 --- a/www/gtkhtml4/pkg-plist +++ b/www/gtkhtml4/pkg-plist @@ -15,11 +15,9 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h -lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.la lib/libgtkhtml-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.so.0 -lib/libgtkhtml-editor-%%VERSION%%.a lib/libgtkhtml-editor-%%VERSION%%.la lib/libgtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-editor-%%VERSION%%.so.0 diff --git a/www/libepc/Makefile b/www/libepc/Makefile index 19661aa9c..26252262d 100644 --- a/www/libepc/Makefile +++ b/www/libepc/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/www/libepc/Makefile 18393 2013-04-26 21:23:07Z kwm $ +# $MCom$ PORTNAME= libepc PORTVERSION= 0.4.4 @@ -15,7 +15,6 @@ LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libgnutls.so:${PORTSDIR}/security/gnutls \ libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomeprefix gtk30 diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index ff4995652..ac10d592e 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/x11-themes/gnome-backgrounds/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-backgrounds PORTVERSION= 3.6.1 @@ -11,7 +11,6 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of backgrounds for GNOME -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix GNU_CONFIGURE= yes diff --git a/x11-themes/gnome-icon-theme-symbolic/Makefile b/x11-themes/gnome-icon-theme-symbolic/Makefile index 553103504..6ba667557 100644 --- a/x11-themes/gnome-icon-theme-symbolic/Makefile +++ b/x11-themes/gnome-icon-theme-symbolic/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom: ports/trunk/x11-themes/gnome-icon-theme-symbolic/Makefile 18433 2013-05-06 21:03:32Z kwm $ +# $MCom$ PORTNAME= gnome-icon-theme-symbolic PORTVERSION= 3.6.2 @@ -12,7 +12,6 @@ COMMENT= GNOME Symbolic Icons BUILD_DEPENDS= icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils -NO_STAGE= yes USE_XZ= yes INSTALLS_ICONS= yes USES= gmake pathfix pkgconfig diff --git a/x11-themes/gtk-theme-engine-clearlooks/Makefile b/x11-themes/gtk-theme-engine-clearlooks/Makefile index c4578ea6c..f3641bd9b 100644 --- a/x11-themes/gtk-theme-engine-clearlooks/Makefile +++ b/x11-themes/gtk-theme-engine-clearlooks/Makefile @@ -1,13 +1,11 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/x11-themes/gtk-theme-engine-clearlooks/Makefile 18393 2013-04-26 21:23:07Z kwm $ - +# $MCom$ +ее PORTNAME= gtk-theme-engine-clearlooks PORTVERSION= 2.91.5 CATEGORIES= x11-themes MASTER_SITES= GNOME -#MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -#DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org @@ -15,7 +13,6 @@ COMMENT= Clearlooks theme engine LICENSE= LGPL21 -NO_STAGE= yes USE_BZIP2= yes USE_GNOME= gtk30 intlhack USES= gettext gmake pathfix diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index ef03edf70..26a8b2aa3 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -1,6 +1,6 @@ # Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ -# $MCom: ports/trunk/x11-toolkits/gtkmm30/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gtkmm PORTVERSION= 3.8.1 @@ -14,7 +14,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= C++ wrapper for Gtk+3 USE_XZ= yes -NO_STAGE= yes .if !defined(REFERENCE_PORT) @@ -23,12 +22,11 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USES= gettext gmake pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool USE_GNOME= gtk30 ltverhack glibmm cairomm atkmm pangomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --disable-documentation \ - --enable-static=yes +CONFIGURE_ARGS= --disable-documentation +ltverhack_PATCH_FILES= build/ltmain.sh PLIST_SUB= VERSION="3.0" API_VERSION="3.0" diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist index e4c94465d..11053ab36 100644 --- a/x11-toolkits/gtkmm30/pkg-plist +++ b/x11-toolkits/gtkmm30/pkg-plist @@ -460,11 +460,9 @@ lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4 -lib/libgdkmm-%%VERSION%%.a lib/libgdkmm-%%VERSION%%.la lib/libgdkmm-%%VERSION%%.so lib/libgdkmm-%%VERSION%%.so.1 -lib/libgtkmm-%%VERSION%%.a lib/libgtkmm-%%VERSION%%.la lib/libgtkmm-%%VERSION%%.so lib/libgtkmm-%%VERSION%%.so.1 diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index 75ab66500..35435ccc6 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: ports/trunk/x11-wm/mutter/Makefile 18577 2013-06-21 18:20:24Z kwm $ +# $MCom$ PORTNAME= mutter PORTVERSION= 3.6.2 @@ -19,13 +19,12 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ RUN_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \ gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas -NO_STAGE= yes USE_XZ= yes USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \ xrender xdamage USE_PYTHON= 2.5+ USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_GNOME= gnomehier gnomeprefix gtk30 intlhack introspection:build \ ltverhack USE_LDCONFIG= yes @@ -34,9 +33,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-compile-warnings=maximum GLIB_SCHEMAS= org.gnome.mutter.gschema.xml -MAN1= mutter-message.1 mutter-theme-viewer.1 \ - mutter-window-demo.1 mutter.1 - PLIST_SUB= VERSION=${PORTVERSION:R} post-patch: diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist index a676cbf88..576ba8b5e 100644 --- a/x11-wm/mutter/pkg-plist +++ b/x11-wm/mutter/pkg-plist @@ -35,6 +35,10 @@ lib/mutter/Meta-3.0.typelib lib/mutter/plugins/default.so libdata/pkgconfig/libmutter.pc libdata/pkgconfig/mutter-plugins.pc +man/man1/mutter-message.1.gz +man/man1/mutter-theme-viewer.1.gz +man/man1/mutter-window-demo.1.gz +man/man1/mutter.1.gz share/GConf/gsettings/mutter-schemas.convert share/applications/mutter.desktop share/gnome/wm-properties/mutter-wm.desktop diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile index 64945397c..7034a2465 100644 --- a/x11/gnome-shell-extensions/Makefile +++ b/x11/gnome-shell-extensions/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= gnome-shell-extensions PORTVERSION= 3.6.2 @@ -13,7 +13,6 @@ COMMENT= GNOME desktop shell extensions LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop RUN_DEPENDS= gnome-shell>=3.6.2:${PORTSDIR}/x11/gnome-shell -NO_STAGE= yes USE_BZIP2= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= glib20 gnomedesktop3 intltool diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index c51d957e3..9d9dea9cb 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,6 +1,6 @@ # Created by: Franz Klammer <klammer@webonaut.com> # $FreeBSD$ -# $MCom: ports/trunk/x11/zenity/Makefile 18393 2013-04-26 21:23:07Z kwm $ +# $MCom$ PORTNAME= zenity PORTVERSION= 2.32.1 @@ -15,7 +15,8 @@ COMMENT= Display GNOME dialogs from the command line BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian -NO_STAGE= yes +CONFLICTS= gtkada-1.2.* zenity3-* + USE_GNOME= gnomeprefix gtk20 gnomedocutils intlhack USE_BZIP2= yes USES= gettext gmake pathfix pkgconfig @@ -23,11 +24,6 @@ GNU_CONFIGURE= yes INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="-lintl ${PTHREAD_LIBS}" - -MAN1= zenity.1 - -CONFLICTS= gtkada-1.2.* OPTIONS_DEFINE= NOTIFY OPTIONS_DEFAULT=NOTIFY @@ -35,7 +31,7 @@ OPTIONS_DEFAULT=NOTIFY .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 96e303ee5..394244024 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -1,5 +1,6 @@ bin/gdialog bin/zenity +man/man1/zenity.1.gz share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png share/gnome/help/zenity/C/figures/zenity-error-screenshot.png diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile index 15ee5abe7..089ff6de6 100644 --- a/x11/zenity3/Makefile +++ b/x11/zenity3/Makefile @@ -1,6 +1,6 @@ # Created by: Franz Klammer <klammer@webonaut.com> # $FreeBSD$ -# $MCom: ports/trunk/x11/zenity3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= zenity PORTVERSION= 3.6.0 @@ -16,8 +16,8 @@ LICENSE= LGPL20 BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -NO_STAGE= yes -LATEST_LINK= zenity3 +CONFLICTS= gtkada-1.2.* zenity-2.* + USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomeprefix gtk30 intlhack USE_XORG= x11 @@ -25,11 +25,6 @@ USE_XZ= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="-pthread" - -MAN1= zenity.1 - -CONFLICTS= gtkada-1.2.* OPTIONS_DEFINE= NOTIFY OPTIONS_DEFAULT=NOTIFY @@ -37,7 +32,7 @@ OPTIONS_DEFAULT=NOTIFY .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/x11/zenity3/pkg-plist b/x11/zenity3/pkg-plist index 568fb4099..8a2f4f3c1 100644 --- a/x11/zenity3/pkg-plist +++ b/x11/zenity3/pkg-plist @@ -1,5 +1,6 @@ bin/gdialog bin/zenity +man/man1/zenity.1.gz share/help/C/zenity/calendar.page share/help/C/zenity/color-selection.page share/help/C/zenity/entry.page |