diff options
| -rw-r--r-- | time/asclock/Makefile | 12 | ||||
| -rw-r--r-- | time/asclock/distinfo | 4 | ||||
| -rw-r--r-- | time/asclock/patches/patch-aa | 4 | ||||
| -rw-r--r-- | time/asclock/pkg/PLIST | 3 |
4 files changed, 13 insertions, 10 deletions
diff --git a/time/asclock/Makefile b/time/asclock/Makefile index bf36fc6e0f8..296c7a84ae4 100644 --- a/time/asclock/Makefile +++ b/time/asclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/07/16 00:36:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/07/16 00:46:42 jlam Exp $ DISTNAME= asclock-classic-1.0 PKGNAME= asclock-1.0 @@ -8,8 +8,9 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} # www.asclock.org is no more MAINTAINER= jlam@netbsd.org COMMENT= NeXTstep-like clock and calendar -USE_IMAKE= YES -USE_XPM= YES +USE_BUILDLINK_ONLY= YES +USE_IMAKE= YES +USE_X11BASE= YES LANGUAGES= en de pt nl no it sv es hu br fr cs ru uk sl id da @@ -50,13 +51,15 @@ do-install: ${FILESDIR}/asclock.sh > ${WRKDIR}/asclock.sh ${INSTALL_SCRIPT} ${WRKDIR}/asclock.sh ${PREFIX}/bin/asclock ${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/libexec/asclock-classic + ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} .if (${OPSYS} == SunOS) ${INSTALL_DATA} ${WRKSRC}/asclock.man ${PREFIX}/man/man1/asclock.1 + @${ECHO} man/man1/asclock.1 >> ${PLIST_SRC} .else ${INSTALL_DATA} ${WRKSRC}/asclock.0 ${PREFIX}/man/cat1/asclock.0 + @${ECHO} man/cat1/asclock.0 >> ${PLIST_SRC} .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-classic - ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} .for LANGUAGE in ${LANGUAGES} ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-classic/${LANGUAGE} cd ${WRKSRC}/${LANGUAGE}; ${INSTALL_DATA} month.xpm weekday.xpm \ @@ -67,4 +70,5 @@ do-install: .endfor @${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC} +.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/asclock/distinfo b/time/asclock/distinfo index cfbb195ca51..a0cdde78ff2 100644 --- a/time/asclock/distinfo +++ b/time/asclock/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:10 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/16 00:46:43 jlam Exp $ SHA1 (asclock-classic-1.0.tar.gz) = 91e98efd49ec71d4018a4372744fa1edcca6172a Size (asclock-classic-1.0.tar.gz) = 33949 bytes -SHA1 (patch-aa) = 63a4952ba090746582438a291236c3107301f1d9 +SHA1 (patch-aa) = 8d9f1cc5b3c035d5e06102b8464aaf9cf757e8cd SHA1 (patch-ab) = 83d20644751d47bb5a90500075354541e43720be SHA1 (patch-ac) = c86fe29211da8d4a884ce94a63eb13a83af7e030 diff --git a/time/asclock/patches/patch-aa b/time/asclock/patches/patch-aa index 72a66c158af..cba09a85790 100644 --- a/time/asclock/patches/patch-aa +++ b/time/asclock/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:12 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/16 00:46:43 jlam Exp $ --- Imakefile.orig Wed Sep 16 11:56:00 1998 +++ Imakefile Thu Oct 28 13:11:11 1999 @@ -1,5 +1,5 @@ -XPMLIB = -L/usr/lib/X11 -lXpm -+XPMLIB = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXpm ++XPMLIB = -lXpm DEPLIBS = $(DEPXLIB) LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) diff --git a/time/asclock/pkg/PLIST b/time/asclock/pkg/PLIST index 7c0f53399f3..cc78204cd5b 100644 --- a/time/asclock/pkg/PLIST +++ b/time/asclock/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/17 23:32:13 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/07/16 00:46:43 jlam Exp $ bin/asclock libexec/asclock-classic -man/cat1/asclock.0 |