summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/felt/Makefile10
-rw-r--r--cad/felt/distinfo4
-rw-r--r--cad/felt/patches/patch-ab4
-rw-r--r--editors/vim-xaw/Makefile12
-rw-r--r--editors/vim-xaw/distinfo6
-rw-r--r--editors/vim-xaw/patches/patch-aa6
-rw-r--r--editors/vim-xaw/patches/patch-ad4
-rw-r--r--editors/xemacs/Makefile6
-rw-r--r--editors/xvile/Makefile8
-rw-r--r--games/freeciv-client/Makefile8
-rw-r--r--games/xboard/Makefile7
-rw-r--r--graphics/fxtv/Makefile15
-rw-r--r--graphics/xfig/Makefile7
-rw-r--r--graphics/xfig/distinfo4
-rw-r--r--graphics/xfig/patches/patch-ab15
-rw-r--r--misc/siag/Makefile4
-rw-r--r--print/gv/Makefile8
-rw-r--r--time/emiclock/Makefile4
-rw-r--r--time/emiclock/distinfo4
-rw-r--r--time/emiclock/patches/patch-ad17
-rw-r--r--x11/kterm/Makefile18
-rw-r--r--x11/kterm/files/patch-xaw3d4
-rw-r--r--x11/xcolorsel/Makefile10
-rw-r--r--x11/xcolorsel/distinfo4
-rw-r--r--x11/xcolorsel/patches/patch-aa4
25 files changed, 99 insertions, 94 deletions
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 501626ee66c..838b808f75d 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/06/20 23:37:01 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/08/23 04:26:51 jlam Exp $
DISTNAME= felt-3.05.src
PKGNAME= felt-3.05
@@ -14,7 +14,6 @@ EXTRACT_ONLY= felt-3.05.src.tar.gz
WRKSRC= ${WRKDIR}/FElt-3.05
USE_X11BASE= # defined
-USE_XAW= # defined
XAW_TYPE?= 3d
MAKE_ENV+= CCOPTS="${CFLAGS}"
@@ -25,11 +24,6 @@ USE_BUILDLINK_ONLY= # defined
USE_GNU_READLINE= # uses remove_history() and history_list()
.include "../../mk/bsd.prefs.mk"
-.include "../../devel/readline/buildlink.mk"
-
-.if ${XAW_TYPE} == "3d"
-.include "../../x11/Xaw3d/buildlink.mk"
-.endif
post-extract:
@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
@@ -42,4 +36,6 @@ post-install:
COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
+.include "../../devel/readline/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index 448ea0398d8..d3c5ef60171 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/06/20 23:37:01 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/23 04:26:51 jlam Exp $
SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
Size (felt-3.05.src.tar.gz) = 956901 bytes
SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
Size (felt-3.05.ps.gz) = 626985 bytes
SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
-SHA1 (patch-ab) = 87c78f9fb64bc994d9ca9c32b57a3863f772583b
+SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
diff --git a/cad/felt/patches/patch-ab b/cad/felt/patches/patch-ab
index 8577260eddf..3abbdd6f810 100644
--- a/cad/felt/patches/patch-ab
+++ b/cad/felt/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/06/20 23:37:01 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
--- src/Velvet/Makefile.orig Mon Feb 21 17:44:51 2000
+++ src/Velvet/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2001/06/20 23:37:01 jlam Exp $
LDFLAGS = $(LDOPTS) -L$(X11LIB)
LIBS = $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\
- -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-+ -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
++ ${LIBXAW} -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
# /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
# /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
# /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 50fc6a6dbac..04681a0b0c0 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/06 17:44:45 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:52 jlam Exp $
.include "../vim-share/Makefile.common"
@@ -10,7 +10,6 @@ DEPENDS+= vim-share-${VIM_VERSION}:../vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-*
USE_X11= yes
-USE_XAW= yes
USE_BUILDLINK_ONLY= yes
CONFIGURE_ARGS+= --enable-gui=athena
@@ -21,11 +20,11 @@ INSTALL_TARGET= installvimbin
.include "../../mk/bsd.prefs.mk"
-.if (${XAW_TYPE} == "standard")
-MAKE_ENV+= XAW_LIB=Xaw
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
+MAKE_ENV+= XAW_LIB="Xaw3d"
.else
-.include "../../x11/Xaw3d/buildlink.mk"
-MAKE_ENV+= XAW_LIB=Xaw3d
+XAW_TYPE= standard
+MAKE_ENV+= XAW_LIB="Xaw"
.endif
post-install:
@@ -39,4 +38,5 @@ post-install:
done
.include "../../devel/ncurses/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/distinfo b/editors/vim-xaw/distinfo
index d3a8fd62d06..12d29b4f045 100644
--- a/editors/vim-xaw/distinfo
+++ b/editors/vim-xaw/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 04:26:52 jlam Exp $
SHA1 (vim-5.8-src.tar.gz) = 36d83481cc2faaae57e0a890c1db4701de32c047
Size (vim-5.8-src.tar.gz) = 1112952 bytes
-SHA1 (patch-aa) = 64a3214cbede9da0e3fc7a7ae20f66d1f05b889c
-SHA1 (patch-ad) = 4bf0cc0a4df1bbd6cf1f9149dd22a8bdc727e03f
+SHA1 (patch-aa) = 6ee4b1538cf6771eadb1dc70930498c51513dcb1
+SHA1 (patch-ad) = b60f161c7d9365f107d33ae9d80d8e999c893492
SHA1 (patch-zb) = 2069c60f506fcbcafdc013f0e2648b371185f20b
diff --git a/editors/vim-xaw/patches/patch-aa b/editors/vim-xaw/patches/patch-aa
index 914da39f71c..d3a7b7041dd 100644
--- a/editors/vim-xaw/patches/patch-aa
+++ b/editors/vim-xaw/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/23 04:26:52 jlam Exp $
--- configure.orig Thu May 10 21:59:18 2001
+++ configure Wed Jun 6 08:36:44 2001
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
# Look for the header file in a standard set of common directories.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in \
-+ ${X11BASE}/include \
++ ${BUILDLINK_X11_DIR}/include \
/usr/X11/include \
/usr/X11R6/include \
/usr/X11R5/include \
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-+ ${X11BASE}/lib \
++ ${BUILDLINK_X11_DIR}/lib \
/usr/X11/lib \
/usr/X11R6/lib \
/usr/X11R5/lib \
diff --git a/editors/vim-xaw/patches/patch-ad b/editors/vim-xaw/patches/patch-ad
index de2866e728b..d65d3aa8ca2 100644
--- a/editors/vim-xaw/patches/patch-ad
+++ b/editors/vim-xaw/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: patch-ad,v 1.4 2001/08/23 04:26:53 jlam Exp $
--- Makefile.orig Thu May 31 16:03:57 2001
+++ Makefile Wed Jun 6 08:38:04 2001
@@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.3 2001/06/06 06:07:31 pooka Exp $
ATHENA_IPATH = -I$(GUI_INC_LOC)
ATHENA_LIBS_DIR = -L$(GUI_LIB_LOC)
-ATHENA_LIBS1 = $(XAW_LIB)
-+ATHENA_LIBS1 = -l$(XAW_LIB)
++ATHENA_LIBS1 = ${LIBXAW}
ATHENA_LIBS2 = -lXt
ATHENA_TARGETS = $(BINDIR)/$(GVIMTARGET) \
$(BINDIR)/$(GVIEWTARGET) \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index f60a20fffa4..aaf7428f61c 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/22 09:32:19 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/08/23 04:26:53 jlam Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
DISTNAME= xemacs-21.1.14
@@ -23,8 +23,9 @@ DEPENDS+= jpeg-*:../../graphics/jpeg
NOT_FOR_PLATFORM= *-*-mips* #fails purespace dumping
HAS_CONFIGURE= YES
-USE_XAW= YES
USE_XPM= YES
+USE_XAW= YES
+XAW_TYPE?= 3d
BUILD_DEFS+= USE_LDAP USE_XFACE
DIST_SUBDIR= xemacs
@@ -39,7 +40,6 @@ PLIST_SUBST+= ELSUFX=.gz
PLIST_SUBST+= ELSUFX=
.endif
-XAW_TYPE?= 3d
.if (${XAW_TYPE} == "standard")
WITH_DIALOGS= --with-dialogs=athena
.else
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 40d34182eef..3928565f704 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:32 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/08/23 04:26:53 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
#
@@ -15,8 +15,6 @@ COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
USE_PERL5= # defined
USE_X11BASE= # defined
-USE_XAW= # defined
-USE_XPM= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-perl
@@ -36,7 +34,7 @@ EGDIR= ${PREFIX}/share/examples/xvile
.include "../../mk/bsd.prefs.mk"
-.if defined(XAW_TYPE) && ${XAW_TYPE} == "3d"
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
CONFIGURE_ARGS+= --with-screen=Xaw3d
CONFIGURE_ARGS+= --with-Xaw3d
.else
@@ -54,4 +52,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR}; \
done
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index a58febb65f3..4bc0f95d3b5 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= Freeciv client with Xaw interface
@@ -8,7 +8,6 @@ DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share
CONFLICTS= freeciv-client-gtk<=1.11.4
USE_X11= # defined
-USE_XAW= # defined
.include "../../mk/bsd.prefs.mk"
@@ -18,9 +17,7 @@ CONFIGURE_ARGS+= --disable-server
CONFIGURE_ARGS+= --disable-make-data
CONFIGURE_ARGS+= --enable-client=xaw
-XAW_TYPE=3d
-
-.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d")
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
CONFIGURE_ARGS+= --with-xaw3d
.endif
@@ -32,4 +29,5 @@ do-install:
.include "../../devel/zlib/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 51f4aee7f16..ed72279386e 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:34 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $
DISTNAME= xboard-4.2.3
CATEGORIES= games
@@ -11,15 +11,12 @@ COMMENT= graphical frontend for GNU Chess, Crafty, ICS or e-mail chess
USE_PERL5= # defined
USE_X11= # defined
-USE_XAW= # defined
-USE_XPM= # defined
INFO_FILES= xboard.info
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --enable-xpm
CONFIGURE_ARGS+= --enable-zippy # interface to ICS
-CPPFLAGS+= -I${X11PREFIX}/include
.include "../../mk/bsd.prefs.mk"
@@ -27,4 +24,6 @@ CPPFLAGS+= -I${X11PREFIX}/include
CONFIGURE_ARGS+= --with-Xaw3d
.endif
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 16ef33aed6b..05396fd250a 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/10 22:54:12 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:53 jlam Exp $
DISTNAME= fxtv-1.03
CATEGORIES= graphics
@@ -9,30 +9,27 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/
COMMENT= TV display application for Brooktree 848 compatible TV cards
-DEPENDS+= tiff>=3.5.5:../../graphics/tiff
-
ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-arm32 NetBSD-1.[5-9]*-atari \
NetBSD-1.[5-9]*-i386
USE_X11BASE= YES
-USE_XAW= YES
-USE_XPM= YES
USE_GMAKE= YES
.include "../../mk/bsd.prefs.mk"
MAKE_ENV+= X11PREFIX=${X11PREFIX}
-XAW_TYPE?= 3d
-
# The purpose of this check is to make sure that there is a "Xaw3d"
# compatible widget set installed because normal "Xaw" won't work.
-
+#
.if (${XAW_TYPE} == standard)
-DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d
+XAW_TYPE= 3d
.endif
post-extract:
@${RM} -f ${WRKSRC}/videolib/videolib.o
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 755676198f5..f359d10ebc2 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/08/20 04:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/08/23 04:26:54 jlam Exp $
#
DISTNAME= xfig.3.2.3d.full
@@ -15,16 +15,16 @@ COMMENT= CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
DEPENDS+= transfig>=3.2.3.4:../../print/transfig
USE_IMAKE= YES
-USE_XAW= YES
XAW_TYPE?= 3d
NO_INSTALL_MANPAGES= YES # install.all does install.man
INSTALL_TARGET= install install.all
CFLAGS+= -I${BUILDLINK_DIR}/include/X11
+MAKE_ENV+= X11PREFIX=${X11PREFIX}
.include "../../mk/bsd.prefs.mk"
-.if ${XAW_TYPE} != "3d"
+.if defined(XAW_TYPE) && (${XAW_TYPE} != "3d" && ${XAW_TYPE} != "xpm")
pre-configure:
cd ${WRKSRC} && \
if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
@@ -46,4 +46,5 @@ post-install:
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 453292773aa..0c971f695ac 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/08/09 15:59:51 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 04:26:54 jlam Exp $
SHA1 (xfig.3.2.3d.full.tar.gz) = 49806d4e081c722bb35e335b3d34a8ad9f7d78af
Size (xfig.3.2.3d.full.tar.gz) = 2846844 bytes
SHA1 (patch-aa) = dd528f771d7b30a7f2504d2e9043cdce7a98f0c1
-SHA1 (patch-ab) = aa4a6b97fd626e668eaf726251a58b9723f91308
+SHA1 (patch-ab) = b47e24ce46894e8c7aa710e3cae8c2559b9676ec
SHA1 (patch-ac) = 1d18e319873a4aa20d60b477318fd05c951c6b16
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 40f7479bea4..1ebb7117d29 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
+$NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
---- Imakefile.orig Tue May 29 20:32:11 2001
-+++ Imakefile Thu Aug 9 17:54:04 2001
+--- Imakefile.orig Tue May 29 14:32:11 2001
++++ Imakefile
@@ -47,8 +47,8 @@
#ifdef USEJPEG
@@ -35,8 +35,9 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
+#define USEXPM_ICON
#ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
+-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
++XPMLIBDIR = $(BUILDLINK_DIR)/lib
+XPMINC = -I$(BUILDLINK_DIR)/include/X11
#endif
@@ -46,7 +47,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
#ifdef XAW3D
-XAW3DINC = -I/usr/include/X11/Xaw3d
-+XAW3DINC = -I$(INCDIR)/X11/Xaw3d
++XAW3DINC = -I$(BUILDLINK_DIR)/include/X11/Xaw3d
DUSEXAW3D = -DXAW3D
XAWLIB = -lXaw3d
#endif
@@ -82,7 +83,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
#ifdef USEINSTALLEDJPEG
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
-+JPEGLIB = -Wl,-R$(PREFIX)/lib -L$(JPEGLIBDIR) -ljpeg
++JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
@@ -99,7 +100,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
#ifdef USEXPM
DUSEXPM = -DUSE_XPM
-XPMLIBS = -L$(XPMLIBDIR) -lXpm
-+XPMLIBS = -Wl,-R$(BUILDLINK_PREFIX.xpm) -L$(XPMLIBDIR) -lXpm
++XPMLIBS = -Wl,-R$(X11PREFIX)/lib -L$(XPMLIBDIR) -lXpm
READXPMS = f_readxpm.c
READXPMO = f_readxpm.o
#ifdef USEXPM_ICON
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index d829b824683..f4390db4b04 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/08/23 04:01:57 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/23 04:26:54 jlam Exp $
DISTNAME= siag-3.1.20
CATEGORIES= misc textproc math
@@ -25,8 +25,6 @@ CFLAGS+= -Dunix
LDFLAGS+= -Wl,-R${X11BASE}/lib
STRIPFLAG=
-.include "../../mk/bsd.prefs.mk"
-
XAW_TYPE?= 3d
.include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/Makefile b/print/gv/Makefile
index d739246fa3a..3936936f16c 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/02/17 17:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/08/23 04:26:54 jlam Exp $
# FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
#
@@ -13,13 +13,12 @@ COMMENT= PostScript and PDF previewer
DEPENDS+= ghostscript-[6-9]*:../../print/ghostscript
USE_IMAKE= yes
-USE_XAW= yes
.include "../../mk/bsd.prefs.mk"
-XAW_TYPE?= 3d
+# We need Xaw3d to build.
.if (${XAW_TYPE} == standard)
-DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d
+XAW_TYPE= 3d
.endif
post-extract:
@@ -28,4 +27,5 @@ post-extract:
post-install:
@(cd ${WRKSRC}; ${MAKE} install.doc)
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index a6cc1cc666c..9a28c45a904 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/04 18:40:57 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/23 04:26:54 jlam Exp $
#
DISTNAME= emiclock-2.0.2
@@ -17,7 +17,6 @@ NO_BIN_ON_CDROM=${RESTRICTED}
USE_X11BASE= yes
USE_IMAKE= yes
-USE_XAW= yes
.include "../../mk/bsd.prefs.mk"
@@ -34,4 +33,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \
${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo
index d9e75e7c0d5..9acae24fdb6 100644
--- a/time/emiclock/distinfo
+++ b/time/emiclock/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:12 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/23 04:26:54 jlam Exp $
SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
Size (emiclock-2.0.2.tar.gz) = 308682 bytes
SHA1 (patch-aa) = 082873291d05709ecc392a3e6295078065aa1d30
SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
-SHA1 (patch-ad) = 619c24b92346dad1b5bf6e23c3d02153aa972694
+SHA1 (patch-ad) = 21ddc7456641bf5a4c50b8d6f04b2874378cd868
SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0
diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad
index c35034d96d6..d2f0fd222da 100644
--- a/time/emiclock/patches/patch-ad
+++ b/time/emiclock/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:18 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/23 04:26:55 jlam Exp $
---- Imakefile.orig Sat Jan 11 11:35:42 1997
-+++ Imakefile Sun May 23 10:21:04 1999
-@@ -108,6 +108,11 @@
+--- Imakefile.orig Thu Sep 2 10:33:47 1999
++++ Imakefile
+@@ -106,6 +106,11 @@
#define StartupSound myu.au
#endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */
@@ -14,3 +14,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:18 wiz Exp $
#else /* USE_NETAUDIO */
/* netaudio (NCDaudio) */
+@@ -143,7 +148,7 @@
+ LOCAL_LIBRARIES = XawClientLibs
+ # ifdef USE_XAW3D
+ DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a
+- XAWLIB = -lXaw3d
++ XAWLIB = ${LIBXAW}
+ # endif /* USE_XAW3D */
+
+ SYS_LIBRARIES = SoundLibrary -lm
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 \
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 6a81adc5223..d7f2c844f30 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/24 09:43:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/23 04:26:55 jlam Exp $
#
DISTNAME= xcolorsel-1.1a-src
@@ -11,7 +11,13 @@ COMMENT= Browse and select named X colors from rgb.txt
WRKSRC= ${WRKDIR}/xcolorsel
USE_IMAKE= yes
-USE_XAW= yes
+
+.include "../../mk/bsd.prefs.mk"
+
+# We need at least Xaw3d to compile this package.
+.if (${XAW_TYPE} == standard)
XAW_TYPE= 3d
+.endif
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo
index 780f4adea96..2a88012fd72 100644
--- a/x11/xcolorsel/distinfo
+++ b/x11/xcolorsel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:51 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/08/23 04:26:55 jlam Exp $
SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes
-SHA1 (patch-aa) = 1dbdc4ab8a347ff904016a8fc1401063652b221a
+SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566
SHA1 (patch-ab) = f6dcb6895bb4013d2a433d164516dd41fc4cd47d
SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1
SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252
diff --git a/x11/xcolorsel/patches/patch-aa b/x11/xcolorsel/patches/patch-aa
index a4b42b0f204..84a00dd1160 100644
--- a/x11/xcolorsel/patches/patch-aa
+++ b/x11/xcolorsel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:18:21 agc Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/23 04:26:55 jlam Exp $
--- Imakefile.orig Tue Dec 13 21:31:19 1994
+++ Imakefile Wed Jul 15 09:56:07 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:18:21 agc Exp $
install:: Xcolorsel.help
-NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,)
-+NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB),)
++NormalProgramTarget(xcolorsel,$(OBJS),,${LIBXAW} $(XMULIB) $(XTOOLLIB) $(XLIB),)
InstallProgram(xcolorsel,$(BINDIR))
InstallManPage(xcolorsel,$(MANDIR))
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 20:57:13 +0000