diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
| commit | a17239c066dcfcad39db4003a2b8d421fa1bc881 (patch) | |
| tree | 4bfa8b36ce531fe4f0f7472d5fdff888abf4b533 /x11/kterm | |
| parent | 79fe9eff8ce0ebb615cb7a647fadec6607504307 (diff) | |
| download | pkgsrc-a17239c066dcfcad39db4003a2b8d421fa1bc881.tar.gz | |
Move per-package default XAW_TYPE setting above the inclusion of
bsd.prefs.mk so that it is actually used. Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.
Diffstat (limited to 'x11/kterm')
| -rw-r--r-- | x11/kterm/Makefile | 18 | ||||
| -rw-r--r-- | x11/kterm/files/patch-xaw3d | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile index 6a65e0fbe69..96d26e24c6b 100644 --- a/x11/kterm/Makefile +++ b/x11/kterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/07/13 05:47:26 enami Exp $ +# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:55 jlam Exp $ DISTNAME= kterm-6.2.0 CATEGORIES= x11 @@ -13,30 +13,30 @@ MAINTAINER= sakamoto@netbsd.org COMMENT= Multi-lingual terminal emulator for X USE_IMAKE= YES -USE_XAW= YES BUILD_DEFS+= KTERM_USE_WALLPAPER .include "../../mk/bsd.prefs.mk" -XAW_TYPE?= standard - -.if defined(KTERM_USE_WALLPAPER) && ${KTERM_USE_WALLPAPER} == imlib +.if defined(KTERM_USE_WALLPAPER) +.if ${KTERM_USE_WALLPAPER} == "imlib" PATCH_SITES+= http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/ PATCHFILES+= KTerm-BGP-Imlib-1.0.patch.gz BUILDLINK_DEPENDS.imlib?= imlib>=1.9.4 -USE_BUILDLINK_ONLY= YES +USE_CONFIG_WRAPPER= YES .include "../../graphics/imlib/buildlink.mk" -.elif defined(KTERM_USE_WALLPAPER) && ${KTERM_USE_WALLPAPER} == YES -USE_XPM= YES +.elif ${KTERM_USE_WALLPAPER} == "YES" PATCH_SITES+= http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/ PATCHFILES+= KTerm-BGP-1.0.patch.gz +.include "../../graphics/xpm/buildlink.mk" +.endif .endif +.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") post-patch: -.if ${XAW_TYPE} != "standard" @${ECHO_MSG} "===> Applying Xaw scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-xaw3d .endif +.include "../../mk/xaw.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kterm/files/patch-xaw3d b/x11/kterm/files/patch-xaw3d index 3e1ea1f55be..df98138591e 100644 --- a/x11/kterm/files/patch-xaw3d +++ b/x11/kterm/files/patch-xaw3d @@ -1,4 +1,4 @@ -$NetBSD: patch-xaw3d,v 1.1.1.1 1999/06/09 11:34:01 sakamoto Exp $ +$NetBSD: patch-xaw3d,v 1.2 2001/08/23 04:26:55 jlam Exp $ --- kterm.h.orig Fri Jul 12 14:01:37 1996 +++ kterm.h Wed Jun 9 10:07:50 1999 @@ -17,7 +17,7 @@ $NetBSD: patch-xaw3d,v 1.1.1.1 1999/06/09 11:34:01 sakamoto Exp $ TEKOBJS = TekPrsTbl.o Tekproc.o #endif +#ifdef KTERM_XAW3D -+ XAWLIB = -lXaw3d ++ XAWLIB = ${LIBXAW} +#endif SRCS1 = button.c charproc.c cursor.c data.c input.c \ main.c menu.c misc.c screen.c scrollbar.c tabs.c \ |