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 /cad/felt | |
| 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 'cad/felt')
| -rw-r--r-- | cad/felt/Makefile | 10 | ||||
| -rw-r--r-- | cad/felt/distinfo | 4 | ||||
| -rw-r--r-- | cad/felt/patches/patch-ab | 4 |
3 files changed, 7 insertions, 11 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 \ |