pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Removed the post-configure check, since i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e34b18aa6b0
branches:  trunk
changeset: 529590:6e34b18aa6b0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jun 08 08:23:49 2007 +0000

description:
Removed the post-configure check, since it was wrong.

Even on newer versions of NetBSD, we need to make sure that
fontconfig-config is not used.

diffstat:

 x11/kdebase3/Makefile |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 266bc43f9b58 -r 6e34b18aa6b0 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Fri Jun 08 08:07:33 2007 +0000
+++ b/x11/kdebase3/Makefile     Fri Jun 08 08:23:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2007/06/07 07:27:09 rillig Exp $
+# $NetBSD: Makefile,v 1.128 2007/06/08 08:23:49 rillig Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
 CATEGORIES=    x11
@@ -134,11 +134,6 @@
 pre-configure:
        cd ${WRKSRC}/ksysguard/ksysguardd && rm -f DragonFly && ln -s FreeBSD DragonFly
 
-post-configure:
-       # Make sure that fontinst has been selected.
-       # Otherwise the package gets incomplete.
-       grep "s,@include_fontinst_tn_TRUE@,," ${WRKSRC}/config.status
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
        ${INSTALL_DATA} ${DISTDIR}/NetBSD-flag-1.0.png ${PREFIX}/${ICONDIR}/NetBSD-flag.png
@@ -176,6 +171,12 @@
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
 CONFIGURE_ENV+= ac_cv_func_getutxent='no'
+.endif
+
+.if ${OPSYS} == "NetBSD"
+# We always use pkg-config for detecting the fontconfig version, since there
+# may exist an old version of fontconfig-config on systems that have been
+# updated from NetBSD 1.x.
 CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
 .endif
 



Home | Main Index | Thread Index | Old Index