aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2009-12-07 04:51:35 +0800
committered <ed@FreeBSD.org>2009-12-07 04:51:35 +0800
commit295726c7a44e927bbb4ef2633533637d578b0a14 (patch)
treee5a091dc1d92341566d725c0f6cf83ce3ed6540e /x11
parent207910d65602e3c98ce5b1505171e346a4206813 (diff)
downloadfreebsd-ports-gnome-295726c7a44e927bbb4ef2633533637d578b0a14.tar.gz
freebsd-ports-gnome-295726c7a44e927bbb4ef2633533637d578b0a14.tar.zst
freebsd-ports-gnome-295726c7a44e927bbb4ef2633533637d578b0a14.zip
Disable the libutempter dependency on OSVERSION 900004 and higher.
libulog now provides a libutempter compatibility interface. Approved by: miwi
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-workspace/Makefile10
-rw-r--r--x11/kdebase4-workspace/Makefile10
2 files changed, 16 insertions, 4 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 57793b747341..ff79b5fb3fac 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase-workspace
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -18,7 +19,6 @@ COMMENT= Basic applications for the KDE system
LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\
dbus-1.3:${PORTSDIR}/devel/dbus \
- utempter:${PORTSDIR}/sysutils/libutempter \
hal.1:${PORTSDIR}/sysutils/hal \
polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
xklavier.12:${PORTSDIR}/x11/libxklavier
@@ -66,6 +66,10 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
.endif
+.if ${OSVERSION} < 900004
+LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/startkde.cmake \
@@ -83,10 +87,12 @@ pre-configure:
redmond/redmond.cpp
${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
${PATCH_WRKSRC}/kwin/clients/${item}
+.endfor
+.if ${OSVERSION} < 900004
${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
-e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
${PATCH_WRKSRC}/kwrited/CMakeLists.txt
-.endfor
+.endif
post-install:
${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 57793b747341..ff79b5fb3fac 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase-workspace
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -18,7 +19,6 @@ COMMENT= Basic applications for the KDE system
LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\
dbus-1.3:${PORTSDIR}/devel/dbus \
- utempter:${PORTSDIR}/sysutils/libutempter \
hal.1:${PORTSDIR}/sysutils/hal \
polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
xklavier.12:${PORTSDIR}/x11/libxklavier
@@ -66,6 +66,10 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
.endif
+.if ${OSVERSION} < 900004
+LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/startkde.cmake \
@@ -83,10 +87,12 @@ pre-configure:
redmond/redmond.cpp
${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
${PATCH_WRKSRC}/kwin/clients/${item}
+.endfor
+.if ${OSVERSION} < 900004
${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
-e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
${PATCH_WRKSRC}/kwrited/CMakeLists.txt
-.endfor
+.endif
post-install:
${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \