diff options
| author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
| commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /sysutils/gkrellm | |
| parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
| download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'sysutils/gkrellm')
| -rw-r--r-- | sysutils/gkrellm/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/gkrellm/buildlink.mk | 2 | ||||
| -rw-r--r-- | sysutils/gkrellm/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/gkrellm/patches/patch-aa | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 16270315f0f..eeed23dbd15 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/06/07 17:15:57 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:59 jlam Exp $ # DISTNAME= gkrellm-1.2.11 @@ -13,13 +13,14 @@ COMMENT= GTK based system monitor BUILD_USES_MSGFMT= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES ALL_TARGET= netbsd INSTALL_TARGET= install_netbsd -MAKE_ENV+= PTHREAD_INC="-I${BUILDLINK_DIR}/include" +MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm @@ -28,6 +29,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm/buildlink.mk b/sysutils/gkrellm/buildlink.mk index 49f5e0af8c7..4d61e90606e 100644 --- a/sysutils/gkrellm/buildlink.mk +++ b/sysutils/gkrellm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/07/24 17:24:50 he Exp $ +# $NetBSD: buildlink.mk,v 1.3 2002/08/25 21:50:59 jlam Exp $ # # This Makefile fragment is included by packages that use gkrellm. # diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index 79a4f239aa7..baa0b514785 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/07 17:15:57 wiz Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:50:59 jlam Exp $ SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3 Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa index d28d6482a6c..58ca932550b 100644 --- a/sysutils/gkrellm/patches/patch-aa +++ b/sysutils/gkrellm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2002/06/07 17:15:57 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2002/08/25 21:51:00 jlam Exp $ --- Makefile.top_enable_nls.orig Wed Dec 5 08:41:15 2001 +++ Makefile.top_enable_nls |