diff options
author | seb <seb> | 2003-09-29 09:54:28 +0000 |
---|---|---|
committer | seb <seb> | 2003-09-29 09:54:28 +0000 |
commit | 5ca3b2ea04702c21afb7f26792bdee72feb655e3 (patch) | |
tree | fe3ae3e46cbe2170782784fce8142eb80a86a6e5 | |
parent | 0a50b6212200ad901d285b9aa70330da9c0001c2 (diff) | |
download | pkgsrc-5ca3b2ea04702c21afb7f26792bdee72feb655e3.tar.gz |
Fix build problem with gcc 3.3.1: replace token concatenation operator
'/**/' with 'XCOMM' in Imakefile.
While here update my email address.
XXX Will come back to it so skill package dependency will be avoided if
pkill(1) is available.
-rw-r--r-- | time/xalarm/Makefile | 4 | ||||
-rw-r--r-- | time/xalarm/distinfo | 4 | ||||
-rw-r--r-- | time/xalarm/patches/patch-aa | 66 |
3 files changed, 63 insertions, 11 deletions
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile index 89221969046..96fc89f8ede 100644 --- a/time/xalarm/Makefile +++ b/time/xalarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/05/10 17:40:00 toshii Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/29 09:54:28 seb Exp $ DISTNAME= xalarm-3.03 PKGNAME= xalarm-3.05 @@ -12,7 +12,7 @@ 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 -MAINTAINER= seb@pbox.org +MAINTAINER= seb@NetBSD.org COMMENT= X11 interactive alarm clock DEPENDS+= skill>=4.0:../../sysutils/skill diff --git a/time/xalarm/distinfo b/time/xalarm/distinfo index 02c0fcecd2b..e36065f62b1 100644 --- a/time/xalarm/distinfo +++ b/time/xalarm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/05 18:11:38 magick Exp $ +$NetBSD: distinfo,v 1.2 2003/09/29 09:54:28 seb Exp $ SHA1 (xalarm-3.03.tar.Z) = 29e684cdfc05a09c9be313f29dc2482a13ef9f95 Size (xalarm-3.03.tar.Z) = 77771 bytes @@ -6,5 +6,5 @@ SHA1 (xalarm-3.03-04.patch.Z) = 78f2d3f6bab8bde2a7081c5d86ab4be0d56b2cc4 Size (xalarm-3.03-04.patch.Z) = 22482 bytes SHA1 (xalarm-3.04-05.patch.Z) = adff386bf34e46b1b757c1e0cc91e3589b63dbd8 Size (xalarm-3.04-05.patch.Z) = 13014 bytes -SHA1 (patch-aa) = 7b73681e4f528541857ec2b4e08fc7be5396ea40 +SHA1 (patch-aa) = ce6ae4709df573f276055cbc1a576fb382e47ecd SHA1 (patch-ab) = 750b887285c62124d792973696a459e3ac9dd007 diff --git a/time/xalarm/patches/patch-aa b/time/xalarm/patches/patch-aa index 1b54eb00d77..cbf9036ce37 100644 --- a/time/xalarm/patches/patch-aa +++ b/time/xalarm/patches/patch-aa @@ -1,8 +1,60 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/06/05 18:11:38 magick Exp $ +$NetBSD: patch-aa,v 1.2 2003/09/29 09:54:28 seb Exp $ ---- Imakefile.orig Fri Jun 1 16:44:51 2001 +--- Imakefile.orig 2003-09-29 08:13:05.000000000 +0000 +++ Imakefile -@@ -29,29 +29,14 @@ +@@ -1,27 +1,27 @@ +-/**/# Based on an Imakefile from: +-/**/# Andreas Stolcke +-/**/# International Computer Science Institute, Berkeley. +-/**/# With help from: +-/**/# George Lindholm, Jonathan I. Kamens, Braham Levy. +- +- +-/**/# o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your +-/**/# fork(2) returns short/long/pid_t not int. +-/**/# o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files, +-/**/# rather than fcntl(2). +-/**/# o Define USELSEEK to use lseek(2) to move to the end of the file, rather +-/**/# than fseek(3). +-/**/# o Define USERENAME to use rename(2) to rename file names (otherwise +-/**/# un/link(2)). +-/**/# o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have +-/**/# gethostname(2) or uname(2)) to get the name of your system. +-/**/# o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user +-/**/# name and home directory on your system. Note that if you want to use +-/**/# this method to get the user's home directory, but another method to get +-/**/# the user name, this symbol must still be defined. +-/**/# o Define USEGETLOGIN to use getlogin(3) to get the user name (note that +-/**/# this may not work if xalarm is invoked from a pseudo terminal). +-/**/# o Define USECUSERID to use cuserid(3) to get the user name. ++XCOMM # Based on an Imakefile from: ++XCOMM # Andreas Stolcke ++XCOMM # International Computer Science Institute, Berkeley. ++XCOMM # With help from: ++XCOMM # George Lindholm, Jonathan I. Kamens, Braham Levy. ++ ++ ++XCOMM # o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your ++XCOMM # fork(2) returns short/long/pid_t not int. ++XCOMM # o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files, ++XCOMM # rather than fcntl(2). ++XCOMM # o Define USELSEEK to use lseek(2) to move to the end of the file, rather ++XCOMM # than fseek(3). ++XCOMM # o Define USERENAME to use rename(2) to rename file names (otherwise ++XCOMM # un/link(2)). ++XCOMM # o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have ++XCOMM # gethostname(2) or uname(2)) to get the name of your system. ++XCOMM # o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user ++XCOMM # name and home directory on your system. Note that if you want to use ++XCOMM # this method to get the user's home directory, but another method to get ++XCOMM # the user name, this symbol must still be defined. ++XCOMM # o Define USEGETLOGIN to use getlogin(3) to get the user name (note that ++XCOMM # this may not work if xalarm is invoked from a pseudo terminal). ++XCOMM # o Define USECUSERID to use cuserid(3) to get the user name. + + DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID + +@@ -29,29 +29,14 @@ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME 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 @@ -33,11 +85,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/05 18:11:38 magick Exp $ xfortune:: -@@ -59,14 +44,6 @@ - +@@ -60,14 +45,6 @@ xyow:: clean:: $(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config -- + -config:: - @./config.1st -quick $(WHICH) fortune yow - @xrdb -merge XAlarm.ad @@ -45,6 +96,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/05 18:11:38 magick Exp $ - -.config:: - @-$(MADE) .config || make config - +- alarm.o: xalarm.h patchlevel.h when.o: xalarm.h patchlevel.h dates.h + warnings.o: xalarm.h patchlevel.h |