From 207910d65602e3c98ce5b1505171e346a4206813 Mon Sep 17 00:00:00 2001 From: ed Date: Sun, 6 Dec 2009 20:49:28 +0000 Subject: Remove the libutempter dependency on OSVERSION 900004 and higher. This functionality is now included in the base system. Approved by: miwi --- x11/kdelibs4/Makefile | 8 ++++++-- x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake | 17 +++++++++++++++++ x11/kdelibs4/files/patch-ConfigureChecks.cmake | 17 ----------------- 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake delete mode 100644 x11/kdelibs4/files/patch-ConfigureChecks.cmake diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f13eb8d72f13..f95dc7d03418 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -31,7 +31,6 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \ png.5:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ idn:${PORTSDIR}/dns/libidn \ - utempter:${PORTSDIR}/sysutils/libutempter \ hal.1:${PORTSDIR}/sysutils/hal \ lzma.0:${PORTSDIR}/archivers/xz \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient @@ -78,6 +77,11 @@ MAN8= kbuildsycoca4.8 \ .include +.if ${OSVERSION} < 900004 +LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter +EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake +.endif + .if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS) LIB_DEPENDS+= avahi-qt4:${PORTSDIR}/net/avahi-qt4 \ dns_sd:${PORTSDIR}/net/avahi-libdns diff --git a/x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake b/x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake new file mode 100644 index 000000000000..a4eb95820986 --- /dev/null +++ b/x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake @@ -0,0 +1,17 @@ +--- ./ConfigureChecks.cmake.orig 2009-06-09 20:09:30.000000000 +0400 ++++ ./ConfigureChecks.cmake 2009-08-06 13:42:18.000000000 +0400 +@@ -144,11 +144,11 @@ + + set(UTIL_LIBRARY) + +- check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP) +- check_include_files(utempter.h HAVE_UTEMPTER_H) ++ check_library_exists(utempter addToUtmp "/usr/local/lib" HAVE_ADDTOUTEMP) ++ check_include_files(/usr/local/include/utempter.h HAVE_UTEMPTER_H) + if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + set(HAVE_UTEMPTER 1) +- set(UTEMPTER_LIBRARY utempter) ++ set(UTEMPTER_LIBRARY /usr/local/lib/libutempter.so) + else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + check_function_exists(login login_in_libc) + if (NOT login_in_libc) diff --git a/x11/kdelibs4/files/patch-ConfigureChecks.cmake b/x11/kdelibs4/files/patch-ConfigureChecks.cmake deleted file mode 100644 index a4eb95820986..000000000000 --- a/x11/kdelibs4/files/patch-ConfigureChecks.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- ./ConfigureChecks.cmake.orig 2009-06-09 20:09:30.000000000 +0400 -+++ ./ConfigureChecks.cmake 2009-08-06 13:42:18.000000000 +0400 -@@ -144,11 +144,11 @@ - - set(UTIL_LIBRARY) - -- check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP) -- check_include_files(utempter.h HAVE_UTEMPTER_H) -+ check_library_exists(utempter addToUtmp "/usr/local/lib" HAVE_ADDTOUTEMP) -+ check_include_files(/usr/local/include/utempter.h HAVE_UTEMPTER_H) - if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) - set(HAVE_UTEMPTER 1) -- set(UTEMPTER_LIBRARY utempter) -+ set(UTEMPTER_LIBRARY /usr/local/lib/libutempter.so) - else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) - check_function_exists(login login_in_libc) - if (NOT login_in_libc) -- cgit