diff options
| -rw-r--r-- | x11/kdelibs4/Makefile | 9 | ||||
| -rw-r--r-- | x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake | 17 |
2 files changed, 1 insertions, 25 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index a33eabdfe2b5..918a69347992 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -63,13 +63,6 @@ SHEBANG_FILES= kdecore/kconfig_compiler/checkkcfg.pl \ kio/proxytype.pl \ kioslave/http/kcookiejar/kcookiescfg.pl -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900004 -LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter -EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake -.endif - post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \ @@ -109,4 +102,4 @@ post-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/mime/all \ ${STAGEDIR}/${PREFIX}/share/mime/uri -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake b/x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake deleted file mode 100644 index a4eb95820986..000000000000 --- a/x11/kdelibs4/files/extra-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) |