diff options
author | wiz <wiz> | 2002-10-23 11:54:03 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-10-23 11:54:03 +0000 |
commit | 4ec1825cf6115969aee6b75bf5685af56d49c3b1 (patch) | |
tree | 9042f946a18449ad3e96149ff3990cae63ad998c /sysutils/kdf | |
parent | 86b479aeb8fad96e984f14bc219e755c3e3cd086 (diff) | |
download | pkgsrc-4ec1825cf6115969aee6b75bf5685af56d49c3b1.tar.gz |
Convert to buildlink2. Thanks to Johnny Lam for a hint on why it did not work.
Diffstat (limited to 'sysutils/kdf')
-rw-r--r-- | sysutils/kdf/Makefile | 19 | ||||
-rw-r--r-- | sysutils/kdf/distinfo | 4 | ||||
-rw-r--r-- | sysutils/kdf/patches/patch-aa | 21 |
3 files changed, 26 insertions, 18 deletions
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index e96e5b15113..8e18e0d12b6 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:43 fredb Exp $ +# $NetBSD: Makefile,v 1.16 2002/10/23 11:54:03 wiz Exp $ # DISTNAME= kdf-0.5.1 @@ -12,21 +12,20 @@ HOMEPAGE= http://www.edu.uni-klu.ac.at/~mkropfbe COMMENT= Shows disk usage graphically and lets you mount/umount devices BUILD_USES_MSGFMT= yes -DEPENDS+= kde-1.1.2nb1:../../x11/kde -USE_LIBINTL= YES +USE_BUILDLINK2= YES +USE_LIBTOOL= YES USE_X11BASE= YES GNU_CONFIGURE= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -EVAL_PREFIX+= KDEBASEDIR=kdebase QT1DIR=qt1 -CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \ - --with-qt-dir=${QT1DIR}/qt1 \ +CONFIGURE_ARGS+=--datadir=${BUILDLINK_PREFIX.kdebase}/share/kde \ + --with-qt-dir=${QTDIR} \ --enable-path-check -CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ - QTDIR=${QT1DIR}/qt1 \ - MOC=${QT1DIR}/qt1/bin/moc \ +CONFIGURE_ENV= KDEDIR=${BUILDLINK_PREFIX.kdebase} \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../x11/kdebase/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index 86241876ebf..d21776854b1 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2002/08/20 18:48:33 skrll Exp $ +$NetBSD: distinfo,v 1.4 2002/10/23 11:54:03 wiz Exp $ SHA1 (kdf-0.5.1.tgz) = 66f8fa8fde7ec9984e1c89d041df8a543ad06a74 Size (kdf-0.5.1.tgz) = 193989 bytes -SHA1 (patch-aa) = 5e1e76aa521c92ae80368a36940813ef1f184f67 +SHA1 (patch-aa) = 0e1945b2fc33780ab6c156a23e5dcc7202ab171b SHA1 (patch-ab) = 8f7fa93665371eda1448317cd12db2e68c49034e SHA1 (patch-ac) = 297143df78c6939b6ed1f752b44d49e0415d64af SHA1 (patch-ad) = bc98f04ee70b716209805a4c4af62157dc6a9e6b diff --git a/sysutils/kdf/patches/patch-aa b/sysutils/kdf/patches/patch-aa index b8b96a335b7..9055cdddd02 100644 --- a/sysutils/kdf/patches/patch-aa +++ b/sysutils/kdf/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2000/02/29 19:43:58 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/10/23 11:54:03 wiz Exp $ ---- configure.orig Sun Apr 18 06:19:40 1999 -+++ configure Sun Oct 24 15:12:08 1999 -@@ -505,9 +505,9 @@ +--- configure.orig Sun Apr 18 12:19:40 1999 ++++ configure +@@ -505,9 +505,9 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/] # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -14,7 +14,16 @@ $NetBSD: patch-aa,v 1.3 2000/02/29 19:43:58 jlam Exp $ fi fi for ac_site_file in $CONFIG_SITE; do -@@ -4065,17 +4065,17 @@ +@@ -2182,7 +2182,7 @@ for ac_kw in inline __inline__ __inline; + #include "confdefs.h" + + int main() { +-} $ac_kw foo() { ++} $ac_kw int foo() { + ; return 0; } + EOF + if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +@@ -4065,17 +4065,17 @@ echo "configure:4064: checking for KDE p if test "$ac_use_path_checking" = "default"; then @@ -42,7 +51,7 @@ $NetBSD: patch-aa,v 1.3 2000/02/29 19:43:58 jlam Exp $ kde_bindir="\$(exec_prefix)/bin" kde_partsdir="\$(exec_prefix)/parts" echo "$ac_t""defaults" 1>&6 -@@ -4240,17 +4240,17 @@ +@@ -4240,17 +4240,17 @@ echo "configure:4239: checking for KDE p if test "default" = "default"; then |