* fetch aslock from the One True Source http://www.asclock.org/

* modify our local patches to add new -dock option to asclock.  This used
  to be called "-withdrawn" before, but was changed to match the options
  of the other "official" asclock distributions.
* install the month and day XPMs for other languages in the name of
  internationalization

6 files changed, 104 insertions, 63 deletions

diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index 5578eab2394..538558b1a21 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,14 +1,23 @@
-# $NetBSD: Makefile,v 1.13 1999/04/15 20:39:48 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/10/07 17:22:59 jlam Exp $
 #
 
-DISTNAME=		asclock
-PKGNAME=		asclock-11
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=X11/clocks/}
+DISTNAME=	asclock-classic-1.0
+PKGNAME=	asclock-1.0
+CATEGORIES=	x11
+MASTER_SITES=	http://www.asclock.org/tar/
 
-MAINTAINER=		hubertf@netbsd.org
+MAINTAINER=	hubertf@netbsd.org
+HOMEPAGE=	http://www.asclock.org/
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
+
+CONFLICTS=	asclock-xlib-* asclock-gtk-*
+
+USE_IMAKE=	yes
+
+LANGUAGES=	english german portuguese dutch norwegian italian swedish \
+		spanish hungarian breton french czech russian ukrainian \
+		slovene indonesian danish
 
 # Choose language from:
 # 1) english [DEFAULT]
@@ -36,10 +45,24 @@ LANG?=1
 # 3) 2bit greyscale        ( 4 colors)
 PANEL?=1
 
-USE_X11BASE=	yes
-INSTALL_TARGET=	install install.man
+WRKSRC=		${WRKDIR}/asclock1.0
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 do-configure:
 	cd ${WRKSRC} ; ( ${ECHO} ${LANG} ; ${ECHO} ${PANEL} ) | ./configure
 
+post-install:
+	${RM} -rf ${WRKSRC}/french/french2
+	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/asclock
+.for LANGUAGE in ${LANGUAGES}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/asclock/${LANGUAGE}
+	cd ${WRKSRC}/${LANGUAGE}; ${INSTALL_DATA} month.xpm weekday.xpm \
+		${PREFIX}/share/examples/asclock/${LANGUAGE}
+	@${ECHO} share/examples/asclock/${LANGUAGE}/month.xpm >> ${PLIST_SRC}
+	@${ECHO} share/examples/asclock/${LANGUAGE}/weekday.xpm >> ${PLIST_SRC}
+	@${ECHO} @dirrm share/examples/asclock/${LANGUAGE} >> ${PLIST_SRC}
+.endfor
+	@${ECHO} @dirrm share/examples/asclock >> ${PLIST_SRC}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/asclock/files/md5 b/x11/asclock/files/md5
index b0696c376e9..4de65742c2f 100644
--- a/x11/asclock/files/md5
+++ b/x11/asclock/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/17 21:17:18 tron Exp $
+$NetBSD: md5,v 1.5 1999/10/07 17:23:00 jlam Exp $
 
-MD5 (asclock.tar.gz) = f8c265e9fbba0e7f7dd02bd2b738fa4c
+MD5 (asclock-classic-1.0.tar.gz) = fc7f280e77b2646a02fd0dd42ac31ceb
diff --git a/x11/asclock/files/patch-sum b/x11/asclock/files/patch-sum
index 8e6b2ab0f62..30aee27a3c4 100644
--- a/x11/asclock/files/patch-sum
+++ b/x11/asclock/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:22 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/07 17:23:00 jlam Exp $
 
-MD5 (patch-aa) = cc07e625671bdea79f22a79a6327a227
-MD5 (patch-ab) = 3b842da450ca63b70b524acb3f141bb1
+MD5 (patch-aa) = 1811eca2938c0c6ce3724852fb9ff828
+MD5 (patch-ab) = 9b2352523b3a1848354f3870f401b463
+MD5 (patch-ac) = bc529b9960dec5e61a71c1c29a7e74bf
diff --git a/x11/asclock/patches/patch-aa b/x11/asclock/patches/patch-aa
index 6f60449bbaa..16556561033 100644
--- a/x11/asclock/patches/patch-aa
+++ b/x11/asclock/patches/patch-aa
@@ -1,52 +1,45 @@
-$NetBSD: patch-aa,v 1.1 1999/01/19 00:59:33 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/07 17:23:01 jlam Exp $
 
---- asclock.c.orig	Sat Apr 11 07:12:23 1998
-+++ asclock.c	Sat Dec  5 02:57:12 1998
+--- asclock.c.orig	Sat Sep 26 17:05:03 1998
++++ asclock.c	Thu Oct  7 02:57:23 1999
 @@ -19,6 +19,7 @@
  int ONLYSHAPE=0; /* default value is noshape */
  int ITBLINKS=1;  /* default is blinking */
  int ICONIFIED=0; /* default is not iconified */
-+int WITHDRAWN=0; /* default is not withdrawn */
++int ITDOCKS=0;   /* default is not Docking mode */
+ int YEAR=0;      /* default is to show time, not year */
  /* led positions *************************************************************/
  int twelve[5]  = {5, 14, 24, 28, 37};
- int twfour[5]  = {4,  8, 17, 22, 31};
-@@ -91,6 +92,7 @@
+@@ -88,11 +89,12 @@
+ "    -monthxpm <xpm>         month xpm",
+ "    -clockxpm <xpm>         clock xpm",
+ "    -weekdayxpm <xpm>       weekday xpm",
++"    -year                   show year instead of time",
+ "    -position [+|-]x[+|-]y  position of asclock",
  "    -shape                  without groundplate",
  "    -noblink                don't blink",
  "    -iconic                 start up as icon",
-+"    -withdrawn              start up in withdrawn mode",
+-"    -year                   show year instead of time",
++"    -dock                   Window Maker docking",
  NULL
  };
  
-@@ -150,10 +152,18 @@
- 	readmonthxpm = 1;
+@@ -173,6 +175,9 @@
+       case 'n':
+         ITBLINKS = 0;
+         continue;
++      case 'd':
++        ITDOCKS = 1;
++        continue;
+       case 'y':
+ 	YEAR = 1;
  	continue;
-       case 'w':
--	if(++i >=argc) usage();
--	strcpy(&weekxpm[0], argv[i]);
--	readweekxpm = 1;
--	continue;
-+	switch(arg[2]) {
-+	case 'e':
-+	  if(++i >=argc) usage();
-+	  strcpy(&weekxpm[0], argv[i]);
-+	  readweekxpm = 1;
-+	  continue;
-+	case 'i':
-+          WITHDRAWN=1;
-+	  continue;
-+	default:
-+	  usage();
-+	}
-       case 's':
- 	ONLYSHAPE=1;
- 	continue;
-@@ -251,13 +261,17 @@
+@@ -256,13 +261,17 @@
      XShapeCombineMask(dpy, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet);
    }
    
 -  mywmhints.initial_state = (ICONIFIED ? IconicState : NormalState);
-+  mywmhints.initial_state = WITHDRAWN ? WithdrawnState :
++  mywmhints.initial_state = ITDOCKS ? WithdrawnState :
 +	(ICONIFIED ? IconicState : NormalState);
    mywmhints.icon_window = iconwin;
    mywmhints.icon_x = mysizehints.x;
diff --git a/x11/asclock/patches/patch-ab b/x11/asclock/patches/patch-ab
index 54f04a22a00..959ffb0d2a2 100644
--- a/x11/asclock/patches/patch-ab
+++ b/x11/asclock/patches/patch-ab
@@ -1,40 +1,49 @@
-$NetBSD: patch-ab,v 1.1 1999/01/19 00:59:33 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 1999/10/07 17:23:01 jlam Exp $
 
---- asclock.man.orig	Sun Aug 25 17:35:49 1996
-+++ asclock.man	Sat Dec  5 03:21:54 1998
-@@ -1,4 +1,4 @@
+--- asclock.man.orig	Wed Sep 16 11:56:00 1998
++++ asclock.man	Thu Oct  7 03:04:28 1999
+@@ -1,14 +1,17 @@
 -.TH asclock 0.99 "23 July 1996" asclock
-+.TH asclock 1.1 "11 April 1998" asclock
++.TH asclock 1.0 "11 April 1998" asclock
  .UC
  .SH NAME
  \fBasclock\fP \- the AfterStep clock
-@@ -8,7 +8,9 @@
-         [-position \fI[+|-]x[+|-]y\fP] 
+ .SH SYNOPSIS
+ .B asclock
+-[ -help] [-12 | -24] [-shape] 
+-        [-position \fI[+|-]x[+|-]y\fP] 
++[ -help] [-12 | -24] [-shape]
          [-exe \fIprogram\fP]
          [-led \fIcolor\fP]
 -        [-noblink] [-iconic]
 +        [-monthxpm \fIxpm\fP] [-clockxpm \fIxpm\fP]
 +        [-weekdayxpm \fIxpm\fP]
-+        [-noblink] [-iconic] [-withdrawn]
++        [-year]
++        [-position \fI[+|-]x[+|-]y\fP] 
++        [-noblink] [-iconic] [-dock]
  .SH DESCRIPTION
  The \fBasclock\fP is a clock written to emulate the date/time application on 
  the NEXTSTEP(tm) operating system.  \fBasclock\fP supports multiple languages, 
-@@ -25,10 +27,14 @@
+@@ -23,12 +26,17 @@
+         where options include:
+             -12                     12 hour format
              -24                     24 hour format
++            -shape                  without groundplate
              -exe <program>          program to start on click
              -led <color>            color of the led
 +            -monthxpm <xpm>         month xpm
 +            -clockxpm <xpm>         clock xpm
 +            -weekdayxpm <xpm>       weekday xpm
++            -year                   show year instead of time
              -position [+|-]x[+|-]y  position of asclock
-             -shape                  without groundplate
+-            -shape                  without groundplate
              -noblink                don't blink
              -iconic                 start up as icon
-+            -withdrawn              start up in withdrawn mode
++            -dock                   Window Maker docking
  .fi
  .RE
  .IP "-12 or -24"
-@@ -50,6 +56,18 @@
+@@ -50,6 +58,22 @@
  .I showrgb
  .P (part of X11).
  .RE
@@ -50,29 +59,33 @@ $NetBSD: patch-ab,v 1.1 1999/01/19 00:59:33 hubertf Exp $
 +.RS
 +specifies the XPM file for the weekday pages.
 +.RE
++.IP "-year"
++.RS
++shows the current the year in the display instead of the current time.
++.RE
  .IP "-position [+|-]x[+|-]y "
  .RS
  specifies the starting position of \fBasclock\fP. The [+|-] works like the standard X-Windows x/y geometry option.
-@@ -66,6 +84,10 @@
+@@ -66,6 +90,10 @@
  .RS
  This gives weird output with AfterStep, so don't bother. It's for mwm and other wm's with no hint functionality.
  .RE
-+.IP "-withdrawn"
++.IP "-dock"
 +.RS
-+starts \fBasclock\fP in withdrawn mode.  This option is necessary to dock \fBasclock\fP in the Window Maker dock.  \fBasclock\fP ignores the -iconic option when started in withdrawn mode.
++starts \fBasclock\fP in docking mode.  This option is necessary to dock \fBasclock\fP in the Window Maker dock.  \fBasclock\fP ignores the -iconic option when started in docking mode.
 +.RE
  .SH INVOCATION
  \fBasclock\fP can be called from one of many ways.  The most common invocation
  is the command line:
-@@ -86,6 +108,14 @@
+@@ -86,6 +114,14 @@
  will cause \fBasclock\fP to use the shape extensions so that it will be a
  button on the \fBWharf (1)\fP button bar under the \fBafterstep (1)\fP 
  window manager.
 +
-+If you run Window Maker then you should use the "-withdrawn" option:
++If you run Window Maker then you should use the "-dock" option:
 +.nf
 +
-+	[user@host] ~% asclock -shape -12 -withdrawn &
++	[user@host] ~% asclock -shape -12 -dock &
 +
 +.fi
 +and then drag the icon to the dock.
diff --git a/x11/asclock/patches/patch-ac b/x11/asclock/patches/patch-ac
new file mode 100644
index 00000000000..2ca22e7a7a7
--- /dev/null
+++ b/x11/asclock/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 1999/10/07 17:23:01 jlam Exp $
+
+--- ./Imakefile.orig	Wed Sep 16 11:56:00 1998
++++ ./Imakefile	Thu Oct  7 01:28:40 1999
+@@ -1,5 +1,5 @@
+ 
+-XPMLIB = -L/usr/lib/X11 -lXpm   
++XPMLIB = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXpm   
+ DEPLIBS = $(DEPXLIB) 
+ 
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)