diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/catclock/Makefile | 7 | ||||
| -rw-r--r-- | time/catclock/distinfo | 4 | ||||
| -rw-r--r-- | time/catclock/patches/patch-aa | 17 | ||||
| -rw-r--r-- | time/plan/Makefile | 8 | ||||
| -rw-r--r-- | time/plan/distinfo | 4 | ||||
| -rw-r--r-- | time/plan/patches/patch-aa | 10 |
6 files changed, 28 insertions, 22 deletions
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 diff --git a/time/plan/Makefile b/time/plan/Makefile index 94cc3fbb691..7c9ce284586 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:19 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2001/07/03 20:35:31 jlam Exp $ # DISTNAME= plan-1.8.4 @@ -10,9 +10,10 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.in-berlin.de/User/bitrot/plan.html COMMENT= Schedule planner based on X/Motif -USE_MOTIF= YES +USE_BUILDLINK_ONLY= YES +ALL_TARGET= netbsd -ALL_TARGET= netbsd +CFLAGS+= -I${X11BASE}/include pre-install: ${INSTALL_DATA_DIR} ${X11PREFIX}/libexec/plan ${X11PREFIX}/share/plan \ @@ -23,4 +24,5 @@ pre-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${X11PREFIX}/share/plan; \ done +.include "../../x11/lesstif/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/plan/distinfo b/time/plan/distinfo index 5f1ac3d28ea..49fea8b95dc 100644 --- a/time/plan/distinfo +++ b/time/plan/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:14 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/03 20:35:32 jlam Exp $ SHA1 (plan-1.8.4.tar.gz) = 0b4c5f2d078d3ad48f734c89a316258a56a5749a Size (plan-1.8.4.tar.gz) = 422458 bytes -SHA1 (patch-aa) = 520a49985d52b3278df3be39a8979346bf3c05f3 +SHA1 (patch-aa) = cfcd2e515118c19770bd2a8ce63cb585b80b5907 SHA1 (patch-ab) = 6670c398271e5ee6d32194c0b69850f381b5cc5c SHA1 (patch-ac) = 3e78546544e2b55e296068be4de31f6366cab2b0 SHA1 (patch-ad) = f50e8e46e1ed503bf6f16c6cd31dd935e9251772 diff --git a/time/plan/patches/patch-aa b/time/plan/patches/patch-aa index 10c69ea5753..87e4249738b 100644 --- a/time/plan/patches/patch-aa +++ b/time/plan/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/03 20:35:32 jlam Exp $ ---- Makefile.orig Mon Jul 17 22:07:03 2000 +--- Makefile.orig Mon Jul 17 16:07:03 2000 +++ Makefile @@ -8,19 +8,19 @@ # after "=", this is parsed and rewritten by the configure script. @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $ BSDIG_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi -NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ - -DNO_MOTIF -+NBSD_C = ${CFLAGS} -ansi -I${PREFIX}/include -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX ++NBSD_C = ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC LINUX_C = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX @@ -70,8 +70,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $ BSDIG_L2= -L/usr/X11/lib -lc -NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 -NBSD_L2 = -L/usr/X11R6/lib -lc -+NBSD_L1 = -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lXm -lXt -lX11 -+NBSD_L2 = -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lc ++NBSD_L1 = ${LDFLAGS} -lXm -lXt -lX11 ++NBSD_L2 = ${LDFLAGS} -lc FBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext -lSM -lICE -lXpm FBSD_L2 = -L/usr/X11R6/lib -lc LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 |