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

5 files changed, 116 insertions, 118 deletions

diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile
index 5660495079e..475e106d792 100644
--- a/x11/asclock-gtk/Makefile
+++ b/x11/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/10 06:47:53 jlam Exp $
+# $NetBSD: Makefile,v 1.3 1999/10/28 19:06:21 jlam Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -12,8 +12,6 @@ HOMEPAGE=	http://www.asclock.org/
 
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
-CONFLICTS=	asclock-* asclock-xlib-* gnome-core-*
-
 USE_X11BASE=	yes
 
 PLIST_SRC=	${PKGDIR}/PLIST \
@@ -30,11 +28,11 @@ pre-install:
 	${RM} -rf ${WRKSRC}/themes/themes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock
-	${INSTALL_DATA} ${WRKSRC}/README.THEMES ${PREFIX}/share/doc/asclock
-	${MKDIR} ${PREFIX}/share/asclock
-	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock
+	${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/bin/asclock-gtk
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asclock-gtk
+	${INSTALL_DATA} ${WRKSRC}/README.THEMES ${PREFIX}/share/doc/asclock-gtk
+	${MKDIR} ${PREFIX}/share/asclock-gtk
+	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/asclock-gtk/files/patch-sum b/x11/asclock-gtk/files/patch-sum
index 6229c79f06c..c2b5c83b497 100644
--- a/x11/asclock-gtk/files/patch-sum
+++ b/x11/asclock-gtk/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/07 17:25:05 jlam Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/28 19:06:22 jlam Exp $
 
-MD5 (patch-aa) = b283930d392cb08d8d7323e0ca2f449c
+MD5 (patch-aa) = 8be133f8928190cf0f9c1ec973b17df9
diff --git a/x11/asclock-gtk/patches/patch-aa b/x11/asclock-gtk/patches/patch-aa
index b36da5c3840..a98cb2101c8 100644
--- a/x11/asclock-gtk/patches/patch-aa
+++ b/x11/asclock-gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/07 17:25:06 jlam Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/28 19:06:22 jlam Exp $
 
 --- ./Makefile.orig	Fri Mar 26 02:08:33 1999
 +++ ./Makefile	Thu Oct  7 04:41:07 1999
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/10/07 17:25:06 jlam Exp $
 +CFLAGS = -Wall
  
 -GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
-+GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/"\" \
++GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock-gtk/"\" \
             -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk`
  GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \
  		.gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/10/07 17:25:06 jlam Exp $
  GNOME_LIBS = -lpanel -lpanel_applet `gnome-config --libs gnomeui gnome gtk gnorba`
  
 -GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
-+GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/"\" \
++GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock-gtk/"\" \
  	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags`
  GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o
  GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs`
diff --git a/x11/asclock-gtk/pkg/PLIST b/x11/asclock-gtk/pkg/PLIST
index fd137cf0e58..d87b6ca6d03 100644
--- a/x11/asclock-gtk/pkg/PLIST
+++ b/x11/asclock-gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/07 17:25:05 jlam Exp $
-bin/asclock
-share/doc/asclock/README.THEMES
-@dirrm share/doc/asclock
+@comment $NetBSD: PLIST,v 1.2 1999/10/28 19:06:22 jlam Exp $
+bin/asclock-gtk
+share/doc/asclock-gtk/README.THEMES
+@dirrm share/doc/asclock-gtk
diff --git a/x11/asclock-gtk/pkg/PLIST.themes b/x11/asclock-gtk/pkg/PLIST.themes
index b5aac9a5e5b..d043172180f 100644
--- a/x11/asclock-gtk/pkg/PLIST.themes
+++ b/x11/asclock-gtk/pkg/PLIST.themes
@@ -1,100 +1,100 @@
-@comment $NetBSD: PLIST.themes,v 1.1.1.1 1999/10/07 17:25:05 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/analog/beats.xpm
-share/asclock/analog/clock.xpm
-share/asclock/analog/config
-share/asclock/analog/date.xpm
-share/asclock/analog/hour.xpm
-share/asclock/analog/led.xpm
-share/asclock/analog/minute.xpm
-share/asclock/analog/month.xpm
-share/asclock/analog/second.xpm
-share/asclock/analog/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/analog
-@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.2 1999/10/28 19:06:22 jlam Exp $
+share/asclock-gtk/Freeamp/beats.xpm
+share/asclock-gtk/Freeamp/clock.xpm
+share/asclock-gtk/Freeamp/config
+share/asclock-gtk/Freeamp/date.xpm
+share/asclock-gtk/Freeamp/hour.xpm
+share/asclock-gtk/Freeamp/led.xpm
+share/asclock-gtk/Freeamp/minute.xpm
+share/asclock-gtk/Freeamp/month.xpm
+share/asclock-gtk/Freeamp/old.clock.xpm
+share/asclock-gtk/Freeamp/second.xpm
+share/asclock-gtk/Freeamp/weekday.xpm
+share/asclock-gtk/Newstone/beats.xpm
+share/asclock-gtk/Newstone/clock.xpm
+share/asclock-gtk/Newstone/config
+share/asclock-gtk/Newstone/date.xpm
+share/asclock-gtk/Newstone/hour.xpm
+share/asclock-gtk/Newstone/led.xpm
+share/asclock-gtk/Newstone/minute.xpm
+share/asclock-gtk/Newstone/month.xpm
+share/asclock-gtk/Newstone/second.xpm
+share/asclock-gtk/Newstone/weekday.xpm
+share/asclock-gtk/Orb/beats.xpm
+share/asclock-gtk/Orb/clock.xpm
+share/asclock-gtk/Orb/config
+share/asclock-gtk/Orb/date.xpm
+share/asclock-gtk/Orb/hour.xpm
+share/asclock-gtk/Orb/led.xpm
+share/asclock-gtk/Orb/minute.xpm
+share/asclock-gtk/Orb/month.xpm
+share/asclock-gtk/Orb/second.xpm
+share/asclock-gtk/Orb/weekday.xpm
+share/asclock-gtk/Stone/beats.xpm
+share/asclock-gtk/Stone/clock.xpm
+share/asclock-gtk/Stone/config
+share/asclock-gtk/Stone/date.xpm
+share/asclock-gtk/Stone/hour.xpm
+share/asclock-gtk/Stone/led.xpm
+share/asclock-gtk/Stone/minute.xpm
+share/asclock-gtk/Stone/month.xpm
+share/asclock-gtk/Stone/second.xpm
+share/asclock-gtk/Stone/weekday.xpm
+share/asclock-gtk/analog/beats.xpm
+share/asclock-gtk/analog/clock.xpm
+share/asclock-gtk/analog/config
+share/asclock-gtk/analog/date.xpm
+share/asclock-gtk/analog/hour.xpm
+share/asclock-gtk/analog/led.xpm
+share/asclock-gtk/analog/minute.xpm
+share/asclock-gtk/analog/month.xpm
+share/asclock-gtk/analog/second.xpm
+share/asclock-gtk/analog/weekday.xpm
+share/asclock-gtk/beats/beats.xpm
+share/asclock-gtk/beats/classic
+share/asclock-gtk/beats/clock.xpm
+share/asclock-gtk/beats/config
+share/asclock-gtk/beats/date.xpm
+share/asclock-gtk/beats/hour.xpm
+share/asclock-gtk/beats/led.xpm
+share/asclock-gtk/beats/minute.xpm
+share/asclock-gtk/beats/month.xpm
+share/asclock-gtk/beats/second.xpm
+share/asclock-gtk/beats/weekday.xpm
+share/asclock-gtk/classic/beats.xpm
+share/asclock-gtk/classic/classic
+share/asclock-gtk/classic/clock.xpm
+share/asclock-gtk/classic/config
+share/asclock-gtk/classic/date.xpm
+share/asclock-gtk/classic/hour.xpm
+share/asclock-gtk/classic/led.xpm
+share/asclock-gtk/classic/minute.xpm
+share/asclock-gtk/classic/month.xpm
+share/asclock-gtk/classic/second.xpm
+share/asclock-gtk/classic/weekday.xpm
+share/asclock-gtk/penguin/clock.xpm
+share/asclock-gtk/penguin/config
+share/asclock-gtk/penguin/date.xpm
+share/asclock-gtk/penguin/led.xpm
+share/asclock-gtk/penguin/month.xpm
+share/asclock-gtk/shaped/beats.xpm
+share/asclock-gtk/shaped/classic
+share/asclock-gtk/shaped/clock.xpm
+share/asclock-gtk/shaped/config
+share/asclock-gtk/shaped/date.xpm
+share/asclock-gtk/shaped/hour.xpm
+share/asclock-gtk/shaped/led.xpm
+share/asclock-gtk/shaped/minute.xpm
+share/asclock-gtk/shaped/month.xpm
+share/asclock-gtk/shaped/second.xpm
+share/asclock-gtk/shaped/weekday.xpm
+@dirrm share/asclock-gtk/shaped
+@dirrm share/asclock-gtk/penguin
+@dirrm share/asclock-gtk/classic
+@dirrm share/asclock-gtk/beats
+@dirrm share/asclock-gtk/analog
+@dirrm share/asclock-gtk/Stone
+@dirrm share/asclock-gtk/Orb
+@dirrm share/asclock-gtk/Newstone
+@dirrm share/asclock-gtk/Freeamp
+@dirrm share/asclock-gtk