diff options
| author | morr <morr@pkgsrc.org> | 2013-01-15 16:21:34 +0000 |
|---|---|---|
| committer | morr <morr@pkgsrc.org> | 2013-01-15 16:21:34 +0000 |
| commit | 190184702e3fb46246ccece841981cafb8195bb1 (patch) | |
| tree | 32a57d9d2dc8b1b3e8b11c0456cec6c97f2deee2 /x11/kterm | |
| parent | c7af145a9aa577204bfdc7196a05a6385b350034 (diff) | |
| download | pkgsrc-190184702e3fb46246ccece841981cafb8195bb1.tar.gz | |
Clean up libXaw handling. [1/2]
- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk
In next part:
- replace more includes with mk/xaw.buildlink3.mk
Diffstat (limited to 'x11/kterm')
| -rw-r--r-- | x11/kterm/Makefile | 9 | ||||
| -rw-r--r-- | x11/kterm/files/patch-xaw3d | 24 |
2 files changed, 2 insertions, 31 deletions
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile index 28637e430b7..b6610452e96 100644 --- a/x11/kterm/Makefile +++ b/x11/kterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2012/10/29 05:06:32 asau Exp $ +# $NetBSD: Makefile,v 1.59 2013/01/15 16:21:35 morr Exp $ DISTNAME= kterm-6.2.0 PKGREVISION= 23 @@ -23,11 +23,6 @@ SPECIAL_PERMS= ${PREFIX:Q}/bin/kterm ${SETUID_ROOT_PERMS} .include "../../mk/bsd.prefs.mk" -.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm" || ${XAW_TYPE} == "neXtaw") -post-patch: - @${ECHO_MSG} "===> Applying Xaw scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${FILESDIR:Q}/patch-xaw3d -.endif - +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kterm/files/patch-xaw3d b/x11/kterm/files/patch-xaw3d deleted file mode 100644 index df98138591e..00000000000 --- a/x11/kterm/files/patch-xaw3d +++ /dev/null @@ -1,24 +0,0 @@ -$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 -@@ -36,6 +36,6 @@ - #define KTERM_KINPUT2 /* Kinput2 protocol */ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ --#undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ - - #endif /* !_KTERM_H_ */ ---- Imakefile.orig Fri Jul 12 14:01:04 1996 -+++ Imakefile Wed Jun 9 10:24:30 1999 -@@ -46,6 +46,9 @@ - TEKSRCS = TekPrsTbl.c Tekproc.c - TEKOBJS = TekPrsTbl.o Tekproc.o - #endif -+#ifdef KTERM_XAW3D -+ 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 \ - util.c VTPrsTbl.c \ |