From ca32fe9bba6628c84283383925e08dcc0875bb71 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 3 Jul 2001 20:35:31 +0000 Subject: Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. --- time/catclock/Makefile | 7 ++++--- time/catclock/distinfo | 4 ++-- time/catclock/patches/patch-aa | 17 ++++++++++------- 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'time/catclock') diff --git a/time/catclock/Makefile b/time/catclock/Makefile index ac56e54fd45..c78885e6a3d 100644 --- a/time/catclock/Makefile +++ b/time/catclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/20 11:40:10 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/07/03 20:43:22 jlam Exp $ # DISTNAME= catclock @@ -13,12 +13,13 @@ EXTRACT_SUFX= .zip MAINTAINER= packages@netbsd.org COMMENT= Variant of the MIT xclock with a "cat" mode -USE_IMAKE= yes -USE_MOTIF= yes +USE_BUILDLINK_ONLY= yes +USE_IMAKE= yes post-extract: ${RM} ${WRKSRC}/makefile ${WRKSRC}/pwd.h ${MV} ${WRKSRC}/xclock.man ${WRKSRC}/catclock.man ${SED} 's/^XClock/Catclock/g' <${WRKSRC}/xclock.ad >${WRKSRC}/Catclock.ad +.include "../../x11/lesstif/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/catclock/distinfo b/time/catclock/distinfo index bf8537f1ca8..ff5ad61eb2d 100644 --- a/time/catclock/distinfo +++ b/time/catclock/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:11 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/03 20:43:22 jlam Exp $ SHA1 (catclock.zip) = 0e977f080968067c4232072aa88d919e3f5daf84 Size (catclock.zip) = 180008 bytes -SHA1 (patch-aa) = 65efd893dfd1a8c7bfc71606f8ada61e22940638 +SHA1 (patch-aa) = b9cb5d37c5c0efe5591973a8641a11edeaf51591 SHA1 (patch-ab) = 86f72fbfcc352781cdc3ae760d3143c58e40cb6a diff --git a/time/catclock/patches/patch-aa b/time/catclock/patches/patch-aa index 9f286fcdcf5..5488bd8b134 100644 --- a/time/catclock/patches/patch-aa +++ b/time/catclock/patches/patch-aa @@ -1,20 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:16 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/03 20:43:22 jlam Exp $ + --- imakefile.orig Sun Dec 20 21:24:08 1992 -+++ imakefile Sat Sep 4 19:55:15 1999 -@@ -2,9 +2,9 @@ ++++ imakefile +@@ -2,18 +2,17 @@ SRCS = xclock.c alarm.c OBJS = xclock.o alarm.o - MOTIF = /usr/lib/DXM -MOTIF_LIBS = $(MOTIF)/lib/Xm/libXm.a $(MOTIF)/lib/Xt/libXt.a -MOTIF_INCS = -I$(MOTIF)/lib -I$(MOTIF)/lib/Xt -+ MOTIF = ${X11BASE} +- INCLUDES = -I. $(MOTIF_INCS) -I$(TOP) ++ MOTIF = ${BUILDLINK_DIR} +MOTIF_LIBS = -lXm -lXt -lSM -lICE +MOTIF_INCS = -I$(MOTIF)/include - INCLUDES = -I. $(MOTIF_INCS) -I$(TOP) ++ INCLUDES = -I. $(MOTIF_INCS) -I$(TOP_X_INCLUDES) DEFINES = -DHAS_GNU_EMACS - CFLAGS = $(DEFINES) $(INCLUDES) -@@ -13,7 +13,7 @@ +- CFLAGS = $(DEFINES) $(INCLUDES) + + LOCAL_LIBRARIES = $(MOTIF_LIBS) SYS_LIBRARIES = -lX11 -lm -- cgit v1.2.3