Install as asclock-xlib to not conflict with other asclocks.

6 files changed, 104 insertions, 174 deletions

diff --git a/x11/asclock-xlib/Makefile b/x11/asclock-xlib/Makefile
index d1c4ecf07b0..b211a8f5130 100644
--- a/x11/asclock-xlib/Makefile
+++ b/x11/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/10 06:47:54 jlam Exp $
+# $NetBSD: Makefile,v 1.3 1999/10/28 19:05:41 jlam Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
@@ -12,12 +12,9 @@ HOMEPAGE=	http://www.asclock.org/
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
-CONFLICTS=	asclock-* asclock-gtk-* gnome-core-*
-
 USE_IMAKE=	yes
 
 PLIST_SRC=	${PKGDIR}/PLIST \
-		${PKGDIR}/PLIST.languages \
 		${PKGDIR}/PLIST.themes
 
 pre-configure:
@@ -27,14 +24,11 @@ pre-install:
 	${RM} -f ${WRKSRC}/themes/Freeamp/Makefile*
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock-xlib
 	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README.THEMES \
-		${PREFIX}/share/doc/asclock
-	${MKDIR} ${PREFIX}/share/asclock
-	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock
-	${MKDIR} ${PREFIX}/share/examples/asclock
-	${CP} -R ${WRKSRC}/languages/* ${PREFIX}/share/examples/asclock
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} \
-		${PREFIX}/share/asclock ${PREFIX}/share/examples/asclock
+		${PREFIX}/share/doc/asclock-xlib
+	${MKDIR} ${PREFIX}/share/asclock-xlib
+	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/asclock-xlib/files/patch-sum b/x11/asclock-xlib/files/patch-sum
index 5a0da6a33e5..b13bfe6146f 100644
--- a/x11/asclock-xlib/files/patch-sum
+++ b/x11/asclock-xlib/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/07 17:26:15 jlam Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/28 19:05:42 jlam Exp $
 
 MD5 (patch-aa) = b7f13f359c8f06660970a4edde5cb865
 MD5 (patch-ab) = fbd1e7028ade24322a52f3d5fba8d299
-MD5 (patch-ac) = b6f69a0fc3d20e2e4ecb523fcbbe7468
+MD5 (patch-ac) = 4e897fb0ad2b595d09cd29d3a24dc75d
diff --git a/x11/asclock-xlib/patches/patch-ac b/x11/asclock-xlib/patches/patch-ac
index 47fb33617af..ed610d5b07c 100644
--- a/x11/asclock-xlib/patches/patch-ac
+++ b/x11/asclock-xlib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/07 17:26:15 jlam Exp $
+$NetBSD: patch-ac,v 1.2 1999/10/28 19:05:42 jlam Exp $
 
 --- ./config.c.orig	Sun Mar 14 18:09:13 1999
 +++ ./config.c	Thu Oct  7 03:36:59 1999
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/10/07 17:26:15 jlam Exp $
    "./themes/",
 -  "/usr/local/share/asclock/",
 -  "/usr/share/asclock/",
-+  PREFIX "/share/asclock/",
++  PREFIX "/share/asclock-xlib/",
    "",
    NULL
  };
diff --git a/x11/asclock-xlib/pkg/PLIST b/x11/asclock-xlib/pkg/PLIST
index 42c2cff7a32..b2329fe9682 100644
--- a/x11/asclock-xlib/pkg/PLIST
+++ b/x11/asclock-xlib/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/07 17:26:15 jlam Exp $
-bin/asclock
-share/doc/asclock/COPYING
-share/doc/asclock/README.THEMES
-@dirrm share/doc/asclock
+@comment $NetBSD: PLIST,v 1.2 1999/10/28 19:05:42 jlam Exp $
+bin/asclock-xlib
+share/doc/asclock-xlib/COPYING
+share/doc/asclock-xlib/README.THEMES
+@dirrm share/doc/asclock-xlib
diff --git a/x11/asclock-xlib/pkg/PLIST.languages b/x11/asclock-xlib/pkg/PLIST.languages
deleted file mode 100644
index f92b4fbc8ee..00000000000
--- a/x11/asclock-xlib/pkg/PLIST.languages
+++ /dev/null
@@ -1,64 +0,0 @@
-@comment $NetBSD: PLIST.languages,v 1.1.1.1 1999/10/07 17:26:15 jlam Exp $
-share/examples/asclock/breton/month.xpm
-share/examples/asclock/breton/weekday.xpm
-share/examples/asclock/czech/month.xpm
-share/examples/asclock/czech/weekday.xpm
-share/examples/asclock/danish/month.xpm
-share/examples/asclock/danish/weekday.xpm
-share/examples/asclock/dutch/month.xpm
-share/examples/asclock/dutch/weekday.xpm
-share/examples/asclock/english/month.xpm
-share/examples/asclock/english/month.xpm~
-share/examples/asclock/english/weekday.xpm
-share/examples/asclock/english/weekday.xpm~
-share/examples/asclock/french/french2/month.xpm
-share/examples/asclock/french/french2/weekday.xpm
-share/examples/asclock/french/month.xpm
-share/examples/asclock/french/weekday.xpm
-share/examples/asclock/german/month.xpm
-share/examples/asclock/german/weekday.xpm
-share/examples/asclock/hebrew/month.xpm
-share/examples/asclock/hebrew/weekday.xpm
-share/examples/asclock/hungarian/month.xpm
-share/examples/asclock/hungarian/weekday.xpm
-share/examples/asclock/indonesian/month.xpm
-share/examples/asclock/indonesian/weekday.xpm
-share/examples/asclock/italian/month.xpm
-share/examples/asclock/italian/weekday.xpm
-share/examples/asclock/japanese/month.xpm
-share/examples/asclock/japanese/weekday.xpm
-share/examples/asclock/norwegian/month.xpm
-share/examples/asclock/norwegian/weekday.xpm
-share/examples/asclock/portuguese/month.xpm
-share/examples/asclock/portuguese/weekday.xpm
-share/examples/asclock/russian/month.xpm
-share/examples/asclock/russian/weekday.xpm
-share/examples/asclock/slovene/month.xpm
-share/examples/asclock/slovene/weekday.xpm
-share/examples/asclock/spanish/month.xpm
-share/examples/asclock/spanish/weekday.xpm
-share/examples/asclock/swedish/month.xpm
-share/examples/asclock/swedish/weekday.xpm
-share/examples/asclock/ukrainian/month.xpm
-share/examples/asclock/ukrainian/weekday.xpm
-@dirrm share/examples/asclock/ukrainian
-@dirrm share/examples/asclock/swedish
-@dirrm share/examples/asclock/spanish
-@dirrm share/examples/asclock/slovene
-@dirrm share/examples/asclock/russian
-@dirrm share/examples/asclock/portuguese
-@dirrm share/examples/asclock/norwegian
-@dirrm share/examples/asclock/japanese
-@dirrm share/examples/asclock/italian
-@dirrm share/examples/asclock/indonesian
-@dirrm share/examples/asclock/hungarian
-@dirrm share/examples/asclock/hebrew
-@dirrm share/examples/asclock/german
-@dirrm share/examples/asclock/french/french2
-@dirrm share/examples/asclock/french
-@dirrm share/examples/asclock/english
-@dirrm share/examples/asclock/dutch
-@dirrm share/examples/asclock/danish
-@dirrm share/examples/asclock/czech
-@dirrm share/examples/asclock/breton
-@dirrm share/examples/asclock
diff --git a/x11/asclock-xlib/pkg/PLIST.themes b/x11/asclock-xlib/pkg/PLIST.themes
index 6f13a966890..56c1907d4fe 100644
--- a/x11/asclock-xlib/pkg/PLIST.themes
+++ b/x11/asclock-xlib/pkg/PLIST.themes
@@ -1,89 +1,89 @@
-@comment $NetBSD: PLIST.themes,v 1.2 1999/10/07 17:37:28 jlam Exp $
-share/asclock/Freeamp/beats.xpm
-share/asclock/Freeamp/clock.xpm
-share/asclock/Freeamp/config
-share/asclock/Freeamp/date.xpm
-share/asclock/Freeamp/hour.xpm
-share/asclock/Freeamp/led.xpm
-share/asclock/Freeamp/minute.xpm
-share/asclock/Freeamp/month.xpm
-share/asclock/Freeamp/old.clock.xpm
-share/asclock/Freeamp/second.xpm
-share/asclock/Freeamp/weekday.xpm
-share/asclock/Newstone/beats.xpm
-share/asclock/Newstone/clock.xpm
-share/asclock/Newstone/config
-share/asclock/Newstone/date.xpm
-share/asclock/Newstone/hour.xpm
-share/asclock/Newstone/led.xpm
-share/asclock/Newstone/minute.xpm
-share/asclock/Newstone/month.xpm
-share/asclock/Newstone/second.xpm
-share/asclock/Newstone/weekday.xpm
-share/asclock/Orb/beats.xpm
-share/asclock/Orb/clock.xpm
-share/asclock/Orb/config
-share/asclock/Orb/date.xpm
-share/asclock/Orb/hour.xpm
-share/asclock/Orb/led.xpm
-share/asclock/Orb/minute.xpm
-share/asclock/Orb/month.xpm
-share/asclock/Orb/second.xpm
-share/asclock/Orb/weekday.xpm
-share/asclock/Stone/beats.xpm
-share/asclock/Stone/clock.xpm
-share/asclock/Stone/config
-share/asclock/Stone/date.xpm
-share/asclock/Stone/hour.xpm
-share/asclock/Stone/led.xpm
-share/asclock/Stone/minute.xpm
-share/asclock/Stone/month.xpm
-share/asclock/Stone/second.xpm
-share/asclock/Stone/weekday.xpm
-share/asclock/beats/beats.xpm
-share/asclock/beats/classic
-share/asclock/beats/clock.xpm
-share/asclock/beats/config
-share/asclock/beats/date.xpm
-share/asclock/beats/hour.xpm
-share/asclock/beats/led.xpm
-share/asclock/beats/minute.xpm
-share/asclock/beats/month.xpm
-share/asclock/beats/second.xpm
-share/asclock/beats/weekday.xpm
-share/asclock/classic/beats.xpm
-share/asclock/classic/classic
-share/asclock/classic/clock.xpm
-share/asclock/classic/config
-share/asclock/classic/date.xpm
-share/asclock/classic/hour.xpm
-share/asclock/classic/led.xpm
-share/asclock/classic/minute.xpm
-share/asclock/classic/month.xpm
-share/asclock/classic/second.xpm
-share/asclock/classic/weekday.xpm
-share/asclock/penguin/clock.xpm
-share/asclock/penguin/config
-share/asclock/penguin/date.xpm
-share/asclock/penguin/led.xpm
-share/asclock/penguin/month.xpm
-share/asclock/shaped/beats.xpm
-share/asclock/shaped/classic
-share/asclock/shaped/clock.xpm
-share/asclock/shaped/config
-share/asclock/shaped/date.xpm
-share/asclock/shaped/hour.xpm
-share/asclock/shaped/led.xpm
-share/asclock/shaped/minute.xpm
-share/asclock/shaped/month.xpm
-share/asclock/shaped/second.xpm
-share/asclock/shaped/weekday.xpm
-@dirrm share/asclock/shaped
-@dirrm share/asclock/penguin
-@dirrm share/asclock/classic
-@dirrm share/asclock/beats
-@dirrm share/asclock/Stone
-@dirrm share/asclock/Orb
-@dirrm share/asclock/Newstone
-@dirrm share/asclock/Freeamp
-@dirrm share/asclock
+@comment $NetBSD: PLIST.themes,v 1.3 1999/10/28 19:05:43 jlam Exp $
+share/asclock-xlib/Freeamp/beats.xpm
+share/asclock-xlib/Freeamp/clock.xpm
+share/asclock-xlib/Freeamp/config
+share/asclock-xlib/Freeamp/date.xpm
+share/asclock-xlib/Freeamp/hour.xpm
+share/asclock-xlib/Freeamp/led.xpm
+share/asclock-xlib/Freeamp/minute.xpm
+share/asclock-xlib/Freeamp/month.xpm
+share/asclock-xlib/Freeamp/old.clock.xpm
+share/asclock-xlib/Freeamp/second.xpm
+share/asclock-xlib/Freeamp/weekday.xpm
+share/asclock-xlib/Newstone/beats.xpm
+share/asclock-xlib/Newstone/clock.xpm
+share/asclock-xlib/Newstone/config
+share/asclock-xlib/Newstone/date.xpm
+share/asclock-xlib/Newstone/hour.xpm
+share/asclock-xlib/Newstone/led.xpm
+share/asclock-xlib/Newstone/minute.xpm
+share/asclock-xlib/Newstone/month.xpm
+share/asclock-xlib/Newstone/second.xpm
+share/asclock-xlib/Newstone/weekday.xpm
+share/asclock-xlib/Orb/beats.xpm
+share/asclock-xlib/Orb/clock.xpm
+share/asclock-xlib/Orb/config
+share/asclock-xlib/Orb/date.xpm
+share/asclock-xlib/Orb/hour.xpm
+share/asclock-xlib/Orb/led.xpm
+share/asclock-xlib/Orb/minute.xpm
+share/asclock-xlib/Orb/month.xpm
+share/asclock-xlib/Orb/second.xpm
+share/asclock-xlib/Orb/weekday.xpm
+share/asclock-xlib/Stone/beats.xpm
+share/asclock-xlib/Stone/clock.xpm
+share/asclock-xlib/Stone/config
+share/asclock-xlib/Stone/date.xpm
+share/asclock-xlib/Stone/hour.xpm
+share/asclock-xlib/Stone/led.xpm
+share/asclock-xlib/Stone/minute.xpm
+share/asclock-xlib/Stone/month.xpm
+share/asclock-xlib/Stone/second.xpm
+share/asclock-xlib/Stone/weekday.xpm
+share/asclock-xlib/beats/beats.xpm
+share/asclock-xlib/beats/classic
+share/asclock-xlib/beats/clock.xpm
+share/asclock-xlib/beats/config
+share/asclock-xlib/beats/date.xpm
+share/asclock-xlib/beats/hour.xpm
+share/asclock-xlib/beats/led.xpm
+share/asclock-xlib/beats/minute.xpm
+share/asclock-xlib/beats/month.xpm
+share/asclock-xlib/beats/second.xpm
+share/asclock-xlib/beats/weekday.xpm
+share/asclock-xlib/classic/beats.xpm
+share/asclock-xlib/classic/classic
+share/asclock-xlib/classic/clock.xpm
+share/asclock-xlib/classic/config
+share/asclock-xlib/classic/date.xpm
+share/asclock-xlib/classic/hour.xpm
+share/asclock-xlib/classic/led.xpm
+share/asclock-xlib/classic/minute.xpm
+share/asclock-xlib/classic/month.xpm
+share/asclock-xlib/classic/second.xpm
+share/asclock-xlib/classic/weekday.xpm
+share/asclock-xlib/penguin/clock.xpm
+share/asclock-xlib/penguin/config
+share/asclock-xlib/penguin/date.xpm
+share/asclock-xlib/penguin/led.xpm
+share/asclock-xlib/penguin/month.xpm
+share/asclock-xlib/shaped/beats.xpm
+share/asclock-xlib/shaped/classic
+share/asclock-xlib/shaped/clock.xpm
+share/asclock-xlib/shaped/config
+share/asclock-xlib/shaped/date.xpm
+share/asclock-xlib/shaped/hour.xpm
+share/asclock-xlib/shaped/led.xpm
+share/asclock-xlib/shaped/minute.xpm
+share/asclock-xlib/shaped/month.xpm
+share/asclock-xlib/shaped/second.xpm
+share/asclock-xlib/shaped/weekday.xpm
+@dirrm share/asclock-xlib/shaped
+@dirrm share/asclock-xlib/penguin
+@dirrm share/asclock-xlib/classic
+@dirrm share/asclock-xlib/beats
+@dirrm share/asclock-xlib/Stone
+@dirrm share/asclock-xlib/Orb
+@dirrm share/asclock-xlib/Newstone
+@dirrm share/asclock-xlib/Freeamp
+@dirrm share/asclock-xlib