Date: Sun, 25 Oct 2015 08:16:50 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400147 - in head: . x11-clocks x11-clocks/xalarm x11-clocks/xalarm/files Message-ID: <201510250816.t9P8Go1L064778@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sun Oct 25 08:16:49 2015 New Revision: 400147 URL: https://svnweb.freebsd.org/changeset/ports/400147 Log: Resurrect xalarm 3.06. Take on maintainership. Added: head/x11-clocks/xalarm/ head/x11-clocks/xalarm/Makefile (contents, props changed) head/x11-clocks/xalarm/distinfo (contents, props changed) head/x11-clocks/xalarm/files/ head/x11-clocks/xalarm/files/patch-Imakefile (contents, props changed) head/x11-clocks/xalarm/files/patch-config.1st (contents, props changed) head/x11-clocks/xalarm/files/patch-dates.c (contents, props changed) head/x11-clocks/xalarm/files/patch-file.c (contents, props changed) head/x11-clocks/xalarm/pkg-descr (contents, props changed) head/x11-clocks/xalarm/pkg-plist (contents, props changed) Modified: head/MOVED head/x11-clocks/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sun Oct 25 06:49:11 2015 (r400146) +++ head/MOVED Sun Oct 25 08:16:49 2015 (r400147) @@ -6458,7 +6458,6 @@ www/horde3-meta||2014-08-20|Has expired: www/horde3-passwd||2014-08-20|Has expired: EOL in April 2012 www/horde3-trean||2014-08-20|Has expired: EOL in April 2012 www/wwwcount||2014-08-20|Has expired: Ancient interactive port -x11-clocks/xalarm||2014-08-20|Has expired: Unmaintained interactive port mail/horde3-turba||2014-08-20|Has expired: EOL in April 2012 deskutils/horde3-nag||2014-08-20|Has expired: EOL in April 2012 devel/horde3-whups||2014-08-20|Has expired: EOL in April 2012 Modified: head/x11-clocks/Makefile ============================================================================== --- head/x11-clocks/Makefile Sun Oct 25 06:49:11 2015 (r400146) +++ head/x11-clocks/Makefile Sun Oct 25 08:16:49 2015 (r400147) @@ -51,6 +51,7 @@ SUBDIR += wmfuzzy SUBDIR += wmtime SUBDIR += wmtimer + SUBDIR += xalarm SUBDIR += xclock SUBDIR += xdaliclock SUBDIR += xfce4-datetime-plugin Added: head/x11-clocks/xalarm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/Makefile Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,20 @@ +# Created by: desmo@bandwidth.org +# $FreeBSD$ + +PORTNAME= xalarm +PORTVERSION= 3.06 +CATEGORIES= x11-clocks +MASTER_SITES= ${MASTER_SITE_XCONTRIB} +MASTER_SITE_SUBDIR= utilities + +MAINTAINER= cy@FreeBSD.org +COMMENT= X based alarm clock + +USES= imake +USE_XORG= ice sm x11 xaw xext xmu xpm xt +IS_INTERACTIVE= yes + +pre-install: + (cd ${WRKSRC} ; ${CP} XAlarm.ad XAlarm-color.ad) + +.include <bsd.port.mk> Added: head/x11-clocks/xalarm/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/distinfo Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,2 @@ +SHA256 (xalarm-3.06.tar.gz) = 1e0a3bc55315748b4f02ba19600819d290541eee2335d5edafa0129be073ad95 +SIZE (xalarm-3.06.tar.gz) = 55351 Added: head/x11-clocks/xalarm/files/patch-Imakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/files/patch-Imakefile Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,92 @@ +--- Imakefile.orig 1995-07-21 07:32:07.000000000 -0700 ++++ Imakefile 2015-10-25 01:02:38.165861182 -0700 +@@ -1,29 +1,29 @@ +-/**/# 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. ++# 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. + +-DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID ++DEFINES = $(SIGNAL_DEFINES) -DFORKRETURNSPID_T -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID + + + OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o +@@ -40,28 +40,25 @@ + + InstallAppDefaults (XAlarm) + InstallAppDefaults (XAlarm-color) +-InstallMultipleFlags (xmemo xfortune xyow,$(BINDIR),$(INSTBINFLAGS)) ++InstallMultipleFlags (xmemo xfortune,$(BINDIR),$(INSTBINFLAGS)) + InstallManPage (xmemo,$(MANDIR)) + InstallManPage (xfortune,$(MANDIR)) +-InstallManPage (xyow,$(MANDIR)) + + includes:: fns.h + + fns.h: +- @./config.1st -quick $(WHICH) fortune yow ++ @./config.1st -quick $(WHICH) fortune + +-xmemo.man xyow.man xfortune.man: +- echo ".so man"`echo ManSuffix`"/xalarm."`echo ManSuffix` > $@ ++xmemo.man xfortune.man: ++ echo ".so xalarm.man" > $@ + + xfortune:: + +-xyow:: +- + clean:: +- $(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config ++ $(RM) xfortune xmemo.man xfortune.man fns.h .config + + config:: +- @./config.1st -quick $(WHICH) fortune yow ++ @./config.1st -quick $(WHICH) fortune + @xrdb -merge XAlarm.ad + @xrdb -merge XAlarm.ad+ + Added: head/x11-clocks/xalarm/files/patch-config.1st ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/files/patch-config.1st Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,49 @@ +--- config.1st.orig 1995-07-12 07:57:09.000000000 -0700 ++++ config.1st 2015-10-25 01:06:50.867096289 -0700 +@@ -3,31 +3,6 @@ + # Just try to find out the full path names for kill, ps, grep & colrm which + # are used within fns.c to do process listing. + +-echo -n ' +-I need to find the path of a few things on your system. If I guess wrongly, +-say so at the end, and I will try again. If I do not know where they reside, I +-will ask you. Default answers are in brackets. If you do not know where they +-are on your system, first try "which <command>" (or equivalent) in a shell, or +-ask your local System Guru or Manager. +- +-+ If you do not have "kill", "ps", "grep" or "colrm" (or equivalent), do not +- panic, xalarm only uses them when it is attempting to list the process ids of +- other xalarms. If you do not have these commands, just hit RETURN. +- +- You can make xalarm, but you will not be able to use the -reset, -kill or +- -list options. +- +- I need to know because xalarm should use full path names. +- +-+ If you do not have "fortune" or "yow", you cannot have the X equivalent since +- they are just front ends to them! But do not panic, they are not necessary +- for xalarm, so if you do not have them just hit RETURN when asked for their +- whereabouts. +- +-Hit RETURN when ready...' +-read dummy +-echo " " +- + if test "$1" = "-quick"; then + mode=-quick + shift +@@ -98,13 +73,4 @@ + chmod +x x$program + done + +-echo -n " +-Are these OK? [y] " +-read ans +-case $ans in +- ""|"y"*|"Y"*) touch .config +- echo " +-Thank you. +-";; +- *) ./config.1st $which $*;; +-esac ++touch .config Added: head/x11-clocks/xalarm/files/patch-dates.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/files/patch-dates.c Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,18 @@ +--- dates.c.orig Fri Apr 2 09:08:14 2004 ++++ dates.c Fri Apr 2 09:17:53 2004 +@@ -297,8 +297,13 @@ + if (year >= 0) date->tm_year = year; + while ((year < 0) and (date->tm_year < (2500-1900)) and + (DaysBetween (&today, date) < 0)) +- if (month < 0) +- date->tm_mon = (date->tm_mon + 1) % 12; ++ if (month < 0) { ++ date->tm_mon++; ++ if (date->tm_mon > 11) { ++ date->tm_mon = 0; ++ date->tm_year++; ++ } ++ } + else + date->tm_year++; + } else Added: head/x11-clocks/xalarm/files/patch-file.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/files/patch-file.c Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,11 @@ +--- file.c.orig 1995-07-12 08:24:22.000000000 -0700 ++++ file.c 2015-10-25 01:08:02.787449291 -0700 +@@ -229,7 +229,7 @@ + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + lock.l_start = lock.l_len = (long) 0; +- fcntl (fileno (file), F_SETFL, O_SYNC); ++ fcntl (fileno (file), F_SETFL, O_FSYNC); + fcntl (fileno (file), F_SETLKW, &lock); + #endif + Added: head/x11-clocks/xalarm/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/pkg-descr Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,6 @@ +This is a port of xalarm. It is a user configurable alarm clock based +on X. It allows multiple alarms to be set, each with a different +message. Alarms can be set either +X number of minutes and it will also +allow alarms set for days. + +ftp://ftp.x.org/contrib/utilities/xalarm.README Added: head/x11-clocks/xalarm/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/xalarm/pkg-plist Sun Oct 25 08:16:49 2015 (r400147) @@ -0,0 +1,8 @@ +bin/xalarm +bin/xmemo +bin/xfortune +lib/X11/app-defaults/XAlarm +lib/X11/app-defaults/XAlarm-color +man/man1/xalarm.1.gz +man/man1/xmemo.1.gz +man/man1/xfortune.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510250816.t9P8Go1L064778>