diff options
| author | jlam <jlam@pkgsrc.org> | 1999-11-03 04:24:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 1999-11-03 04:24:59 +0000 |
| commit | 870bc96615ce06e1d4fb2e2ce56a6618d9313438 (patch) | |
| tree | 283e5f880f036e588976f4dde1e3e31e7ecfc85a | |
| parent | 627075e288ac3e18fe9dbe181e25b7e6237f174b (diff) | |
| download | pkgsrc-870bc96615ce06e1d4fb2e2ce56a6618d9313438.tar.gz | |
Rename asclock directories so that it doesn't conflict with GNOME's
asclock_applet (x11/gnome-core). Asclock may not be theme-able, but it does
support different languages, so give the user a choice of which one to use.
| -rw-r--r-- | x11/asclock/Makefile | 18 | ||||
| -rw-r--r-- | x11/asclock/files/asclock.sh | 6 | ||||
| -rw-r--r-- | x11/asclock/pkg/PLIST | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile index 684e470f947..c2df9f7d76f 100644 --- a/x11/asclock/Makefile +++ b/x11/asclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/10/28 19:04:56 jlam Exp $ +# $NetBSD: Makefile,v 1.16 1999/11/03 04:24:59 jlam Exp $ # DISTNAME= asclock-classic-1.0 @@ -48,18 +48,18 @@ do-install: ${SED} -e "s,@PREFIX@,${PREFIX},g" \ ${FILESDIR}/asclock.sh > ${WRKDIR}/asclock.sh ${INSTALL_SCRIPT} ${WRKDIR}/asclock.sh ${PREFIX}/bin/asclock - ${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/libexec/asclock + ${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/libexec/asclock-classic ${INSTALL_DATA} ${WRKSRC}/asclock.0 ${PREFIX}/man/cat1/asclock.0 - ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock + ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-classic ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} .for LANGUAGE in ${LANGUAGES} - ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock/${LANGUAGE} + ${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-classic/${LANGUAGE} cd ${WRKSRC}/${LANGUAGE}; ${INSTALL_DATA} month.xpm weekday.xpm \ - ${PREFIX}/share/asclock/${LANGUAGE} - @${ECHO} share/asclock/${LANGUAGE}/month.xpm >> ${PLIST_SRC} - @${ECHO} share/asclock/${LANGUAGE}/weekday.xpm >> ${PLIST_SRC} - @${ECHO} @dirrm share/asclock/${LANGUAGE} >> ${PLIST_SRC} + ${PREFIX}/share/asclock-classic/${LANGUAGE} + @${ECHO} share/asclock-classic/${LANGUAGE}/month.xpm >> ${PLIST_SRC} + @${ECHO} share/asclock-classic/${LANGUAGE}/weekday.xpm >> ${PLIST_SRC} + @${ECHO} @dirrm share/asclock-classic/${LANGUAGE} >> ${PLIST_SRC} .endfor - @${ECHO} @dirrm share/asclock >> ${PLIST_SRC} + @${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/x11/asclock/files/asclock.sh b/x11/asclock/files/asclock.sh index ea26e28391b..3d64d8b94e3 100644 --- a/x11/asclock/files/asclock.sh +++ b/x11/asclock/files/asclock.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: asclock.sh,v 1.1 1999/10/28 19:04:57 jlam Exp $ +# $NetBSD: asclock.sh,v 1.2 1999/11/03 04:24:59 jlam Exp $ args='' while [ $# -gt 0 ] @@ -21,7 +21,7 @@ do shift done -ASCLOCKDIR=@PREFIX@/share/asclock +ASCLOCKDIR=@PREFIX@/share/asclock-classic # default to American English if [ -z "${LANG}" -o ! -d ${ASCLOCKDIR}/${LANG} ] @@ -33,4 +33,4 @@ monthxpm=${ASCLOCKDIR}/${LANG}/month.xpm weekdayxpm=${ASCLOCKDIR}/${LANG}/weekday.xpm args="${args} -monthxpm ${monthxpm} -weekdayxpm ${weekdayxpm}" -exec @PREFIX@/libexec/asclock ${args} +exec @PREFIX@/libexec/asclock-classic ${args} diff --git a/x11/asclock/pkg/PLIST b/x11/asclock/pkg/PLIST index b3e81acaa57..7e1d763cf33 100644 --- a/x11/asclock/pkg/PLIST +++ b/x11/asclock/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1999/10/28 19:04:57 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/11/03 04:24:59 jlam Exp $ bin/asclock -libexec/asclock +libexec/asclock-classic man/cat1/asclock.0 |