summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorperry <perry@pkgsrc.org>2006-04-16 01:00:06 +0000
committerperry <perry@pkgsrc.org>2006-04-16 01:00:06 +0000
commit1549c66dabf45b79fc21d6e5069048e1a7f1ab8d (patch)
treedd0ecd4e2b6c4de1216eb1dfcc0788115d8c43fa
parentcd207f2987c8a51db2b639efb4f205dd60fa36f4 (diff)
downloadpkgsrc-1549c66dabf45b79fc21d6e5069048e1a7f1ab8d.tar.gz
Update to 3.06. It was released ten years ago, but for whatever
reason we were using 3.03 and patching it up to 3.05. The only ChangeLog entry is Fix DIALOGVALUE from Charles Durst <cdurst@world.std.com>. Also, rig this to use Xaw3d correctly. I may make the default use more modern colors later.
-rw-r--r--time/xalarm/Makefile18
-rw-r--r--time/xalarm/distinfo18
-rw-r--r--time/xalarm/files/XAlarm-color.ad13
-rw-r--r--time/xalarm/patches/patch-aa13
-rw-r--r--time/xalarm/patches/patch-ab10
5 files changed, 38 insertions, 34 deletions
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile
index fba10d589fc..1ef6571cefc 100644
--- a/time/xalarm/Makefile
+++ b/time/xalarm/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/16 01:00:06 perry Exp $
-DISTNAME= xalarm-3.03
-PKGNAME= xalarm-3.05
-PKGREVISION= 2
+DISTNAME= xalarm-3.06
CATEGORIES= time
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=R5contrib-fixes/xalarm/}
-EXTRACT_SUFX= .tar.Z
-
-PATCH_SITES= ${MASTER_SITE_XCONTRIB:=R5contrib-fixes/xalarm/}
-PATCHFILES= xalarm-3.03-04.patch.Z xalarm-3.04-05.patch.Z
-PATCH_DIST_STRIP=-p1
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
+EXTRACT_SUFX= .tar.gz
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= X11 interactive alarm clock
DEPENDS+= skill>=4.0:../../sysutils/skill
-WRKSRC= ${WRKDIR}/xalarm
USE_IMAKE= yes
+XAW_TYPE?= 3d
FORTUNE= "Sorry, xfortune is unavailable - no fortune!"
YOW= "Sorry, xyow is unavailable - no yow!"
@@ -57,5 +51,7 @@ pre-configure:
${SED} -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \
-e 's|@GREP@|${GREP}|' \
-e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h
+ ${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
+.include "../../mk/xaw.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/xalarm/distinfo b/time/xalarm/distinfo
index 4a1b9015f07..f637372e2c6 100644
--- a/time/xalarm/distinfo
+++ b/time/xalarm/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/01/02 22:34:10 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/04/16 01:00:06 perry Exp $
-SHA1 (xalarm-3.03.tar.Z) = 29e684cdfc05a09c9be313f29dc2482a13ef9f95
-RMD160 (xalarm-3.03.tar.Z) = 9208d0cefc0c53b57d36c7f1129a3b4b83821ab2
-Size (xalarm-3.03.tar.Z) = 77771 bytes
-SHA1 (xalarm-3.03-04.patch.Z) = 78f2d3f6bab8bde2a7081c5d86ab4be0d56b2cc4
-RMD160 (xalarm-3.03-04.patch.Z) = ecbcccd2b78d3a364bfceef7852a6937be64e889
-Size (xalarm-3.03-04.patch.Z) = 22482 bytes
-SHA1 (xalarm-3.04-05.patch.Z) = adff386bf34e46b1b757c1e0cc91e3589b63dbd8
-RMD160 (xalarm-3.04-05.patch.Z) = 78225fad50d0d0f8b4225031b20b0eaff32a87fe
-Size (xalarm-3.04-05.patch.Z) = 13014 bytes
-SHA1 (patch-aa) = ce6ae4709df573f276055cbc1a576fb382e47ecd
-SHA1 (patch-ab) = 750b887285c62124d792973696a459e3ac9dd007
+SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5
+RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea
+Size (xalarm-3.06.tar.gz) = 55351 bytes
+SHA1 (patch-aa) = 9d6837ff4ba95d82b37df9144178581e39a48283
+SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29
SHA1 (patch-ac) = c053df3ac2503a03233e076b590e6387b04f6faa
diff --git a/time/xalarm/files/XAlarm-color.ad b/time/xalarm/files/XAlarm-color.ad
new file mode 100644
index 00000000000..f05715763b1
--- /dev/null
+++ b/time/xalarm/files/XAlarm-color.ad
@@ -0,0 +1,13 @@
+! $NetBSD: XAlarm-color.ad,v 1.1 2006/04/16 01:00:06 perry Exp $
+! This file disappeared from the distribution between 3.05 and 3.06 for
+! unknown reasons.
+
+#include "XAlarm"
+
+XAlarm*background: LightYellow
+XAlarm*foreground: IndianRed
+XAlarm*Command.background: IndianRed
+XAlarm*Command.foreground: LightYellow
+XAlarm.When?.when.Dialog.background: MidnightBlue
+XAlarm.Warning!.warning.background: HotPink
+XAlarm.Alarm!.alarm.background: DarkGreen
diff --git a/time/xalarm/patches/patch-aa b/time/xalarm/patches/patch-aa
index cbf9036ce37..2ba2d94df43 100644
--- a/time/xalarm/patches/patch-aa
+++ b/time/xalarm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2003/09/29 09:54:28 seb Exp $
+$NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $
---- Imakefile.orig 2003-09-29 08:13:05.000000000 +0000
-+++ Imakefile
+--- Imakefile.orig 1995-07-21 10:32:07.000000000 -0400
++++ Imakefile 2006-04-15 20:52:05.000000000 -0400
@@ -1,27 +1,27 @@
-/**/# Based on an Imakefile from:
-/**/# Andreas Stolcke
@@ -54,14 +54,15 @@ $NetBSD: patch-aa,v 1.2 2003/09/29 09:54:28 seb Exp $
DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID
-@@ -29,29 +29,14 @@ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME
+@@ -29,29 +29,16 @@
OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o
SRCS = alarm.c when.c warnings.c times.c dates.c file.c fns.c xalarm.c
-# How we find commands. Use WHICH, LOCATE or FIND.
-WHICH= WHICH
-MADE = test -f
--
++XAWLIB = ${LIBXAW}
+
LOCAL_LIBRARIES = XawClientLibs
-AllTarget (.config)
@@ -85,7 +86,7 @@ $NetBSD: patch-aa,v 1.2 2003/09/29 09:54:28 seb Exp $
xfortune::
-@@ -60,14 +45,6 @@ xyow::
+@@ -60,14 +47,6 @@
clean::
$(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config
diff --git a/time/xalarm/patches/patch-ab b/time/xalarm/patches/patch-ab
index 15417be2ded..9fa387f5dd4 100644
--- a/time/xalarm/patches/patch-ab
+++ b/time/xalarm/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/06/05 18:11:38 magick Exp $
+$NetBSD: patch-ab,v 1.2 2006/04/16 01:00:06 perry Exp $
---- when.c.orig Fri Jun 1 14:01:32 2001
-+++ when.c
-@@ -306,7 +306,7 @@
+--- when.c.orig 1995-07-12 11:24:08.000000000 -0400
++++ when.c 2006-04-15 17:52:35.000000000 -0400
+@@ -308,7 +308,7 @@
{
static Boolean edited = True;
-- if (not (Boolean) clientdata)
+- if (not clientdata)
+ if (clientdata == NULL)
XtSetSensitive (xalarm.savebutton, edited = False);
else if (not edited)