summaryrefslogtreecommitdiffstats
path: root/x11/gnome-desktop
diff options
context:
space:
mode:
authorgusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-08-16 03:44:33 +0800
committergusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-08-16 03:44:33 +0800
commit817fa2b1f81dbeaa5bed72fe1fa826bfbda44ecf (patch)
tree5a679ff3c41382969b2e70a71da9a9484e795111 /x11/gnome-desktop
parent44dcca2542e8092cf3bd06845987212d9b95886c (diff)
downloadmarcuscom-ports-817fa2b1f81dbeaa5bed72fe1fa826bfbda44ecf.tar.gz
marcuscom-ports-817fa2b1f81dbeaa5bed72fe1fa826bfbda44ecf.tar.zst
marcuscom-ports-817fa2b1f81dbeaa5bed72fe1fa826bfbda44ecf.zip
Remove keepla from MC. While here do other changes:
- Remove STRIP_CMD all over the place and replace that with INSTALL_TARGET=install-tsrip - Drop full path *_DEPENDS (like ${LOCALBASE}/bin/flex) and use either binary names (when possible) or package names instead. I've been tempted to convert options to a more compact form, but this will happen in the future. Tested by: two complete poudriere runs git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19813 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-desktop')
-rw-r--r--x11/gnome-desktop/Makefile20
-rw-r--r--x11/gnome-desktop/pkg-plist1
2 files changed, 11 insertions, 10 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b7c9ee321..5323e35db 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 3.12.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -15,18 +16,18 @@ USES= tar:xz
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
- ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
- ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+BUILD_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \
+ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
+ libxkbfile>=0:${PORTSDIR}/x11/libxkbfile \
itstool:${PORTSDIR}/textproc/itstool
LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
- ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
- ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
+RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \
+ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
+ libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
-USES+= bison gettext gmake libtool:keepla pathfix pkgconfig python:3
+USES+= bison gettext gmake libtool pathfix pkgconfig python:3
USE_GNOME= gnomeprefix gtk30 intlhack introspection:build \
referencehack
USE_XORG= x11 xrandr xext
@@ -35,6 +36,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
post-patch:
@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 288a22469..db081b7fa 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -10,7 +10,6 @@ include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
lib/girepository-1.0/GnomeDesktop-3.0.typelib
-lib/libgnome-desktop-3.la
lib/libgnome-desktop-3.so
lib/libgnome-desktop-3.so.10
lib/libgnome-desktop-3.so.10.0.0