CVS commit: pkgsrc/time/plan

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/time/plan
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sun, 17 May 2026 07:09:37 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 17 07:09:37 UTC 2026

Modified Files:
        pkgsrc/time/plan: Makefile PLIST distinfo
        pkgsrc/time/plan/patches: patch-aa patch-ab patch-ac patch-ad patch-ah
            patch-ai patch-aj patch-ak
Added Files:
        pkgsrc/time/plan/patches: patch-al patch-am

Log Message:
time/plan: update to 1.12

# changes (since 1.9)

====== 1.12 released 17.10.17 =======

FEATURES:
    * feature by Ralf Paaschen: can page through months with PageUp, PageDown,
      Home, and End keys
    * the manpages reflect the Debian Linux paths.
    * the "make linux" Makefile target is now 64 bits; use "make linux32" for
      32 bits. Just "make" is still equivalent to "make debian".

====== 1.11 released 4.3.14 =======

BUG FIXES:
    * Petter Reinholdtsen
      - make the -L option of pland the default on Debian, considered safer
      - standalone mode accepts 4-digit years in dates: [[yyyy]mmdd]
      - the number of Unix groups a user belongs to is now unlimited
      - hardening: plan could be crashed by adding % codes in language files
      - fixed syntax errors in Bavarion holiday file
      - don't strip executable, the Debian installer does that (bug #437776)
      - fix compiler warnings, enable more compiler checks on Debian
      - fix manpage typos
      - fixed Debian regex compilation with FreeBSD kernel (Bug #414130)
      - moved plan and pland pid temp files from /tmp to ~/.plan.dir
    * new compilation target: "make debian". Must run "./configure" first.
    * updated "./configure" script with new Debian paths
    * removed -lXp from linux link line, that library is no longer needed
    * added restart and (dummy) force-reload to /etc/init.d/netplan.boot:
      Debian plan 1.10.1-5 E init.d-script-does-not-implement-required-option
    * sourcing /lib/lsb/init-function to /etc/init.d/netplan.boot:
      Debian plan 1.10.1-5 W init.d-script-does-not-source-init-functions

====== 1.10.2 released 9.12.08 =======

BUG FIXES:
    * fixed OpenSuSE 10.3 link error, by Hitoshi Yamauchi <hitoshi%mental.com@localhost>
    * updated Spanish language support, by Gerardo Cafferata
      <gccafferata%yahoo.com.ar@localhost>

====== 1.10.1 released 3.7.07 =======

BUG FIXES:
    * fixed "last weekday in month" expressions in holiday file, by Arnaud
      Giersch <arnaud.giersch%iut-bm.univ-fcomte.fr@localhost>
    * fixed mother's day definition in French holiday file, by Arnaud Giersch
      <arnaud.giersch%iut-bm.univ-fcomte.fr@localhost>

====== 1.10 released 9.4.07 =======

FEATURES:
    * implemented limited read-only support for vCalendar/iCalendar (.ics)
      files (Apple, Zimbra, Lotus, etc), which can be specified in File ->
      File list like other files. Repetition information is ignored.
    * added "make linux64" target. Some 64-bit Linux installations, notably
      OpenSUSE 10.2, omit 32-bit libraries or links, causing compilation errors
      for -lXt and others.
    * ported to MacOS X with X11 and OpenMotif. Requires X11 from the MacOS X
      install DVD, and OpenMotif from www.ist-inc.com/DOWNLOADS/motif_files/
      openmotif-compat-2.1.31_IST.macosx10.3.dmg . The X server must run, and
      DISPLAY must be set properly (like, localhost:0) or plan won't start up.
      This is not a proper Aqua/Cocoa/Carbon port, although I made some feeble
      attempts to fix the color scheme.
    * new Polish language file by Jaroslaw Arlet <j.arlet%awf-gorzow.edu.pl@localhost>
    * new command-line option -Y allows entering annual (yearly) appointments,
      by Steffen Pietsch <Steffen.Pietsch%berlinonline.de@localhost>
    * when alarms trigger, '%' codes in the short note text, message, and the
      script are expanded. (See the help text in plan's Message/Script help.)
      Eg., you can write message texts like "remember to see %U on %D at %T".
          %N    the short note text
          %M    the message text
          %S    the script text
          %D    the final trigger date
          %T    the final trigger time
          %L    the length in hours:minutes
          %F    the file the appointment is stored in, or "private"
          %U    your login name
          %%    a percent sign, '%'

BUG FIXES:
    * fixed a timezone bug that could make alarms go off exactly 24 hours late,
      Aaron Kaplan <kaplan%cs.rochester.edu@localhost>
    * manpage files were installed without the trailing ".1" and ".4"
    * fixed compiler errors under Cygwin because the symbol linux was not set.
    * added -m32 option for Linux; gcc 4 defaults to 64 bits but the required
      libraries are not usually installed.
    * entering a day of the month as a date will now correctly find the next
      date with that day. A bug caused it to switch to a random date in 2000.
    * fixed a language file read error that omitted a trailing null byte.
      By Julien Soula <jsoula%univ-lille2.fr@localhost>
    * an incomplete X resource file crashed plan. Now defaults are used; the
      resulting windows are not very usable but it doesn't crash.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/time/plan/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/time/plan/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/time/plan/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/time/plan/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/time/plan/patches/patch-ab
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/plan/patches/patch-ac \
    pkgsrc/time/plan/patches/patch-ad pkgsrc/time/plan/patches/patch-ah \
    pkgsrc/time/plan/patches/patch-ai pkgsrc/time/plan/patches/patch-aj
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/plan/patches/patch-ak
cvs rdiff -u -r0 -r1.1 pkgsrc/time/plan/patches/patch-al \
    pkgsrc/time/plan/patches/patch-am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/plan/Makefile
diff -u pkgsrc/time/plan/Makefile:1.37 pkgsrc/time/plan/Makefile:1.38
--- pkgsrc/time/plan/Makefile:1.37      Fri May 14 11:40:39 2021
+++ pkgsrc/time/plan/Makefile   Sun May 17 07:09:37 2026
@@ -1,36 +1,24 @@
-# $NetBSD: Makefile,v 1.37 2021/05/14 11:40:39 nia Exp $
+# $NetBSD: Makefile,v 1.38 2026/05/17 07:09:37 vins Exp $
 
-DISTNAME=      plan-1.9
-PKGREVISION=   1
-CATEGORIES=    x11 time
-MASTER_SITES=  ftp://ftp.fu-berlin.de/unix/graphics/plan/
+DISTNAME=      plan-1.12
+CATEGORIES=    time x11
+MASTER_SITES=  https://bitrot.de/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     https://me.in-berlin.de/~bitrot/plan.html
+HOMEPAGE=      https://me.in-berlin.de/~bitrot/plan.html
 COMMENT=       Schedule planner based on X/Motif
+LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/src
 USE_TOOLS+=    yacc lex
 
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths+=    Makefile
-SUBST_SED.paths+=      -e "s,/usr/X11R6,${X11BASE},g"
+LDFLAGS.SunOS+=        -lsocket -lnsl
+
+BUILD_TARGET=  pkgsrc
 
 INSTALLATION_DIRS=     libexec/plan ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 \
                        share/plan/holiday
 
-BUILD_TARGET.IRIX=     ${LOWER_VENDOR}${OS_VERSION:C/.[0-9]//}
-BUILD_TARGET.SunOS=    solg
-BUILD_TARGET.*=                ${LOWER_OPSYS}
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-3.*)
-post-configure:
-       ${TOUCH} ${BUILDLINK_DIR}/include/varargs.h
-.endif
-
 pre-install:
        ${RM} -f ${WRKDIR}/${DISTNAME}/holiday/holiday_*.orig
        for f in ${WRKDIR}/${DISTNAME}/holiday/holiday_*; do            \
@@ -40,5 +28,11 @@ pre-install:
                ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${DESTDIR}${PREFIX}/share/plan; \
        done
 
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/plan/PLIST
diff -u pkgsrc/time/plan/PLIST:1.7 pkgsrc/time/plan/PLIST:1.8
--- pkgsrc/time/plan/PLIST:1.7  Sun Jun 14 18:17:59 2009
+++ pkgsrc/time/plan/PLIST      Sun May 17 07:09:37 2026
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2026/05/17 07:09:37 vins Exp $
 bin/plan
 libexec/plan/netplan
 libexec/plan/notifier
 libexec/plan/plan_cal.ps
 libexec/plan/pland
 @exec ${MKDIR} %D/libexec/plan/netplan.dir && ${CHMOD} 700 %D/libexec/plan/netplan.dir && ${CHOWN} 32767:39 %D/libexec/plan/netplan.dir
-@unexec ${RMDIR} %D/libexec/plan/netplan.dir 2>/dev/null || echo "==> %D/libexec/plan/netplan.dir not empty. You should remove it manually if it's no longer needed."
 @unexec ${RMDIR} %D/libexec/plan 2>/dev/null || ${TRUE}
 man/man1/netplan.1
 man/man1/plan.1
@@ -44,4 +43,5 @@ share/plan/plan.lang.english
 share/plan/plan.lang.french
 share/plan/plan.lang.german
 share/plan/plan.lang.italian
+share/plan/plan.lang.polish
 share/plan/plan.lang.spanish

Index: pkgsrc/time/plan/distinfo
diff -u pkgsrc/time/plan/distinfo:1.12 pkgsrc/time/plan/distinfo:1.13
--- pkgsrc/time/plan/distinfo:1.12      Tue Oct 26 11:24:31 2021
+++ pkgsrc/time/plan/distinfo   Sun May 17 07:09:37 2026
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:24:31 nia Exp $
+$NetBSD: distinfo,v 1.13 2026/05/17 07:09:37 vins Exp $
 
-BLAKE2s (plan-1.9.tar.gz) = b3f54ff29805adb4fdb97033c172f454a9c464e315e53750ea70954b88ee7fe6
-SHA512 (plan-1.9.tar.gz) = 539a598a48b02e89dc409e30ee477b114582f6c58f9f135ae3fc5e164c33947bfe9f8172609d9ce5c4feff64638ff99c033a94334fcd8e19ba91c32f00fc88b7
-Size (plan-1.9.tar.gz) = 441599 bytes
-SHA1 (patch-aa) = 8909b4fab90facef041879bc41d81e84a3bd7430
-SHA1 (patch-ab) = 6670c398271e5ee6d32194c0b69850f381b5cc5c
-SHA1 (patch-ac) = cc9b1d9dacd1c84eeee0c9a82193d0d588ca64e4
-SHA1 (patch-ad) = 0a5e3b54576759d42381596925612509b4f94671
+BLAKE2s (plan-1.12.tar.gz) = 0cde15f4ac694a1fe62d37012f7d4777ccc4a5ec8c86e140bf1b1d6a00c18799
+SHA512 (plan-1.12.tar.gz) = c2c6cac7f9e88c7cf17e076e5021c83d4db89668ef512da595f713f01131a7ae991be7f5071edfa87189eb4ebce710832cd08c0b1b5e89ae6bff58ca06cb023b
+Size (plan-1.12.tar.gz) = 439996 bytes
+SHA1 (patch-aa) = 946bf7376315b37ffeb9c98003ac1a98252ecac6
+SHA1 (patch-ab) = 8a31b3883a759f23043db307e136e6942be83f75
+SHA1 (patch-ac) = ab2e2f36e60106602bfbbb62b1c87918f63d4c61
+SHA1 (patch-ad) = ee7fcd1ca6df09a0b2c7fcf403cb752fd8bb6ed6
 SHA1 (patch-ae) = 64c71d707c8e99837a2395fc0cf115eb9f71d9cd
 SHA1 (patch-af) = 58fadadd62916452aa2036ddf9a26b7448149804
 SHA1 (patch-ag) = e99b6cf76ea463b9e75ee6760aaa1ad2e3a1afa1
-SHA1 (patch-ah) = b5067b9d0cf20a599fb9b1288a89ebc0d5a7da92
-SHA1 (patch-ai) = 23c6a25095296d932435969c884ae706820d9a1d
-SHA1 (patch-aj) = 05bb2fcef75bc11c1904bc2bc54f171b42f04167
-SHA1 (patch-ak) = 4a76d71c457d43950b9d4c2beb9e6f86da2590aa
+SHA1 (patch-ah) = b900101076caa8a6f91378ef466bd9f0f8028e54
+SHA1 (patch-ai) = ceef45a9b239b162bb50643c74f54683ed65bb5d
+SHA1 (patch-aj) = 7cb2b76aa648da2d4a5ba28478a241f0c0b3cea3
+SHA1 (patch-ak) = a8e631c8d6386d2e6eba72e89f05672e5cd626a1
+SHA1 (patch-al) = aeaec222233efb4c8f0e3911a630fcd0f4dc51cc
+SHA1 (patch-am) = 4a784355324f89d0afdb6e35f9fc785b20070a26

Index: pkgsrc/time/plan/patches/patch-aa
diff -u pkgsrc/time/plan/patches/patch-aa:1.6 pkgsrc/time/plan/patches/patch-aa:1.7
--- pkgsrc/time/plan/patches/patch-aa:1.6       Sat Apr 28 15:20:42 2007
+++ pkgsrc/time/plan/patches/patch-aa   Sun May 17 07:09:37 2026
@@ -1,35 +1,35 @@
-$NetBSD: patch-aa,v 1.6 2007/04/28 15:20:42 reed Exp $
+$NetBSD: patch-aa,v 1.7 2026/05/17 07:09:37 vins Exp $
 
---- Makefile.orig      2005-02-06 13:11:34.000000000 -0600
-+++ Makefile   2007-04-26 09:15:40.000000000 -0500
+--- Makefile.orig      2017-10-25 14:17:42.000000000 +0000
++++ Makefile
 @@ -8,19 +8,19 @@
  # after "=", this is parsed and rewritten by the configure script.
  #
  #                             # user-callable executable (plan)
 -DIR=/usr/local/bin
-+DIR=${PREFIX}/bin
++DIR=$(PREFIX)/bin
  #                             # auxiliary programs (pland, notifier, PS)
 -LIB=/usr/local/lib
-+LIB=${PREFIX}/libexec/plan
++LIB=$(PREFIX)/libexec/plan
  #                             # help file (plan.help)
 -SBIN=/usr/local/bin
-+SBIN=${LIB}
++SBIN=$(LIB)
  #                             # system programs (netplan)
 -HELP=/usr/local/lib
-+HELP=${PREFIX}/share/plan
++HELP=$(PREFIX)/share/plan
  #                             # netplan expects netplan.dir/ here
 -NETPLANDIR=/usr/local/lib
-+NETPLANDIR=${LIB}
++NETPLANDIR=$(LIB)
  #                             # unformatted nroff manpage (plan.[14])
 -MAN=/usr/local/man/man
-+MAN=${PREFIX}/${PKGMANDIR}/man
++MAN=$(PREFIX)/$(PKGMANDIR)/man
  #                             # formatted manpage (plan.[14])
 -CATMAN=/usr/catman/local/cat
-+CATMAN=${PREFIX}/${PKGMANDIR}/cat
++CATMAN=$(PREFIX)/$(PKGMANDIR)/cat
  #                             # subdirectory in home dir, or empty
  PLANRULE=
  #                             # lockfile for plan, %d is uid
-@@ -34,12 +34,12 @@
+@@ -34,12 +34,12 @@ LEX=lex
  #                             # standard Unix compiler generator
  YACC=yacc
  #                             # numerical user ID of <nobody> account
@@ -41,61 +41,57 @@ $NetBSD: patch-aa,v 1.6 2007/04/28 15:20
  #                             # used by plan to pre-process holiday files,
  #                             # plan will check if this file really exists
 -CPP_PATH='/lib/cpp -P -I$(HELP)'
-+CPP_PATH='/usr/bin/cpp -P -I$(HELP)'
++CPP_PATH='$(CPP) -P -I$(HELP)'
  #                             # by default, fork on startup? TRUE or FALSE
  DOFORK=TRUE
  #                             # switching to ISO8859-1
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ HOLIDAY=german
  DEBUG=-g
  DEBUG=-O2
  #                             # what to do without make arguments
 -DEFTARGET=linux
-+DEFTARGET=netbsd
++DEFTARGET=pkgsrc
  #------------------------- end of configuration section ----------------------
  
  OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
-@@ -103,7 +103,7 @@
+@@ -168,7 +168,7 @@ OS2_C      = -Zmt -Wimplicit -Wno-unused -I$(
+         -DNOLOCK
+ LYNX_C  = -DNOREGEX -D__NO_INCLUDE_WARN__ -DBSD -mthreads
+ MACOSX_C= -W -Wall -I/usr/X11R6/include -I/usr/OpenMotif/include -DNOLOCK -DMACOSX -DNOREGEX
+-
++PKGSRC_C  = $(CFLAGS) -I$(X11BASE)/include -ansi -DSTDLIBMALLOC
  
- SGI4_C        =
- SGI5_C        = -DSYSV -DSVR4 -DDESKTOP
--SGI6_C        = -n32 -mips3 -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
-+SGI6_C        = ${CFLAGS} -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
- HP8_C = -Aa -I/usr/include/Motif1.1 -I/usr/include/X11R4 -I/usr/include\
-         -D_INCLUDE_HPUX_SOURCE -D_INCLUDE_POSIX_SOURCE\
-         -D_INCLUDE_XOPEN_SOURCE -DNOREGEX -DFIXMBAR -DRABBITS
-@@ -137,8 +137,7 @@
- USL_C = -DNOKILL0 -I/usr/X/include
- BSDI_C        = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi
- BSDIG_C       = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi 
--NBSD_C        = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
--        -DNO_MOTIF
-+NBSD_C        = ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX 
- FBSD_C        = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
-         -DSTDLIBMALLOC
- OBSD_C        = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
-@@ -217,8 +216,8 @@
- BSDI_L2       = -lc
- BSDIG_L1= -L/usr/X11/lib -lXm -lXt -lX11
- BSDIG_L2= -L/usr/X11/lib -lc
--NBSD_L1       = -L/usr/X11R6/lib -lXm -lXt -lX11
--NBSD_L2       = -L/usr/X11R6/lib -lc
-+NBSD_L1       =  ${LDFLAGS} -lXm -lXt -lX11
-+NBSD_L2       = ${LDFLAGS} -lc
- FBSD_L1       = -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext -lSM -lICE -lXpm
- FBSD_L2       = -L/usr/X11R6/lib -lc
- OBSD_L1       = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
-@@ -403,8 +402,8 @@
- bsdig:
-       env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all
- 
--netbsd:
--      env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all
-+netbsd dragonfly:
-+      env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=${CC} $(MAKE) all
- 
- freebsd:
-       env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
-@@ -556,34 +555,18 @@
+ #
+ # loader flags. Requires X11, Xt, and Motif libraries. PW is for regcmp/regex.
+@@ -258,7 +258,8 @@ LYNX_L1    = -mthreads -lXm_s -lXt_s -lSM -
+ LYNX_L2       = -mthreads -lbsd
+ MACOSX_L1= -L/usr/X11R6/lib -L/usr/OpenMotif/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
+ MACOSX_L2= -lc
+-
++PKGSRC_L1 = $(LDFLAGS) -L$(X11BASE)/lib $(LIBS) -lXm -lXt -lX11 -lXpm -lSM -lXext -lICE -lX11              
++PKGSRC_L2 = $(LDFLAGS) -lc -lm
+ 
+ start: $(DEFTARGET)
+ 
+@@ -313,6 +314,7 @@ help:
+       @echo "  make os2       OS/2, XFree86"
+       @echo "  make lynx      LynxOS mag 2.5.1 092297-D i386"
+       @echo "  make macosx    MacOS X with OpenMotif 2.1 (www.ist-inc.com)"
++      @echo "  make pkgsrc    pkgsrc bootstrap
+       @echo ""
+       @echo "  make install   install compiled programs in"
+       @echo "                 $(DIR), $(SBIN), and $(LIB)."
+@@ -478,6 +480,9 @@ lynx:
+ macosx:
+       env CF="$(MACOSX_C)" L1F="$(MACOSX_L1)" L2F="$(MACOSX_L2)" MYCC=gcc make all
+ 
++pkgsrc:
++      env CF="$(PKGSRC_C)" L1F="$(PKGSRC_L1)" L2F="$(PKGSRC_L2)" MYCC=$(CC) $(MAKE) all
++
+ #------------------------------ don't change anything below ------------------
+ 
+ INC   = bm_blank.h bm_except.h bm_icon.h bm_iconsub.h bm_checker.h\
+@@ -583,34 +588,19 @@ g_dbase.o g_dbfile.o g_formfile.o g_form
  
  #---------------------------------------------------------------
  install:
@@ -103,30 +99,16 @@ $NetBSD: patch-aa,v 1.6 2007/04/28 15:20
 -      mkdir -p $(DESTDIR)$(DIR)
 -      cp plan $(DESTDIR)$(DIR)
 -      mkdir -p $(DESTDIR)$(LIB)
--      cp pland notifier ../misc/plan_cal.ps ../language/* $(DESTDIR)$(LIB)
+-      cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
 -      mkdir -p $(DESTDIR)$(SBIN)
 -      cp netplan $(DESTDIR)$(SBIN)
 -      -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
 -      mkdir -p $(DESTDIR)$(HELP)
 -      cp ../language/plan.help $(DESTDIR)$(HELP)
--      -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
+-#     -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
 -      -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
 -      -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
 -      -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
--      mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
--      -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
--      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan) || exit 0
--      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan) || exit 0
--      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan) || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan) || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan) || exit 0
--      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan) || exit 0
--      -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
--      -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
--      -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
 +      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(DIR)
 +      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(LIB)
 +      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(HELP)
@@ -134,11 +116,25 @@ $NetBSD: patch-aa,v 1.6 2007/04/28 15:20
 +      ${BSD_INSTALL_PROGRAM} pland notifier netplan $(DESTDIR)$(LIB)
 +      ${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(DESTDIR)$(LIB)
 +      ${BSD_INSTALL_DATA} ../language/plan.* $(DESTDIR)$(HELP)
-+      -mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
-+      -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
+       mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
+-      -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
+-      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1) || exit 0
+-      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4) || exit 0
+-      -(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1) || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
+-      -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
+-      -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
+-      -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
+-      -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
++      chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
 +      ${BSD_INSTALL_MAN} ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1
 +      ${BSD_INSTALL_MAN} ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4
 +      ${BSD_INSTALL_MAN} ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1
++
        @echo ""
        @echo "use ../holiday/* as templates for your ~/.holiday file"
  

Index: pkgsrc/time/plan/patches/patch-ab
diff -u pkgsrc/time/plan/patches/patch-ab:1.1.1.1 pkgsrc/time/plan/patches/patch-ab:1.2
--- pkgsrc/time/plan/patches/patch-ab:1.1.1.1   Sun Dec 17 23:32:23 2000
+++ pkgsrc/time/plan/patches/patch-ab   Sun May 17 07:09:37 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2026/05/17 07:09:37 vins Exp $
 
---- time.c.orig        Mon Oct 11 21:11:36 1999
+--- time.c.orig        2026-05-17 04:34:41.541583739 +0000
 +++ time.c
-@@ -244,7 +244,7 @@
-                       zone += 24;
+@@ -246,7 +246,7 @@ void guess_tzone(void)
+                       zone -= 24;
                zone *= 3600;
  #else
 -#if defined(bsdi) || defined(SUN) || defined(SVR4) || defined(convex)

Index: pkgsrc/time/plan/patches/patch-ac
diff -u pkgsrc/time/plan/patches/patch-ac:1.3 pkgsrc/time/plan/patches/patch-ac:1.4
--- pkgsrc/time/plan/patches/patch-ac:1.3       Wed Aug  8 21:07:48 2007
+++ pkgsrc/time/plan/patches/patch-ac   Sun May 17 07:09:37 2026
@@ -1,14 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2007/08/08 21:07:48 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2026/05/17 07:09:37 vins Exp $
 
---- weekcalc.c.orig    2007-08-08 20:37:57.000000000 +0000
+--- weekcalc.c.orig    2017-10-17 06:29:05.000000000 +0000
 +++ weekcalc.c
-@@ -8,9 +8,6 @@
+@@ -8,7 +8,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
--#if !defined NEWSOS4 && !defined STDLIBMALLOC
--#include <malloc.h>
--#endif
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC && !defined MACOSX
++#if !defined STDLIBMALLOC
+ #include <malloc.h>
+ #endif
  #include <time.h>
- #include <Xm/Xm.h>
- #include "cal.h"
Index: pkgsrc/time/plan/patches/patch-ad
diff -u pkgsrc/time/plan/patches/patch-ad:1.3 pkgsrc/time/plan/patches/patch-ad:1.4
--- pkgsrc/time/plan/patches/patch-ad:1.3       Wed Aug  8 21:07:48 2007
+++ pkgsrc/time/plan/patches/patch-ad   Sun May 17 07:09:37 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2007/08/08 21:07:48 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2026/05/17 07:09:37 vins Exp $
 
---- servmenu.c.orig    2007-08-08 20:39:15.000000000 +0000
+--- servmenu.c.orig    2017-10-17 06:29:05.000000000 +0000
 +++ servmenu.c
 @@ -8,7 +8,7 @@
  
  #include <stdio.h>
  #include <time.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <Xm/Xm.h>
- #include <Xm/DialogS.h>
- #include <Xm/Form.h>
+-#ifndef MACOSX
++#ifndef STDLIBMALLOC
+ #include <malloc.h>
+ #else
+ #include <stdlib.h>
Index: pkgsrc/time/plan/patches/patch-ah
diff -u pkgsrc/time/plan/patches/patch-ah:1.3 pkgsrc/time/plan/patches/patch-ah:1.4
--- pkgsrc/time/plan/patches/patch-ah:1.3       Wed Aug  8 21:07:49 2007
+++ pkgsrc/time/plan/patches/patch-ah   Sun May 17 07:09:37 2026
@@ -1,14 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2007/08/08 21:07:49 joerg Exp $
+$NetBSD: patch-ah,v 1.4 2026/05/17 07:09:37 vins Exp $
 
---- yovcalc.c.orig     2007-08-08 20:40:01.000000000 +0000
+--- yovcalc.c.orig     2017-10-17 06:29:05.000000000 +0000
 +++ yovcalc.c
-@@ -8,9 +8,6 @@
+@@ -8,7 +8,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
--#if !defined NEWSOS4 && !defined STDLIBMALLOC
--#include <malloc.h>
--#endif
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC && !defined MACOSX
++#if !defined STDLIBMALLOC
+ #include <malloc.h>
+ #endif
  #include <time.h>
- #include <Xm/Xm.h>
- #include "cal.h"
Index: pkgsrc/time/plan/patches/patch-ai
diff -u pkgsrc/time/plan/patches/patch-ai:1.3 pkgsrc/time/plan/patches/patch-ai:1.4
--- pkgsrc/time/plan/patches/patch-ai:1.3       Wed Aug  8 21:07:49 2007
+++ pkgsrc/time/plan/patches/patch-ai   Sun May 17 07:09:37 2026
@@ -1,25 +1,22 @@
-$NetBSD: patch-ai,v 1.3 2007/08/08 21:07:49 joerg Exp $
+$NetBSD: patch-ai,v 1.4 2026/05/17 07:09:37 vins Exp $
 
---- holiday.c.orig     2005-01-09 09:44:34.000000000 +0000
+--- holiday.c.orig     2017-10-17 06:29:05.000000000 +0000
 +++ holiday.c
-@@ -20,11 +20,6 @@
+@@ -20,7 +20,7 @@
  #include <stdlib.h>
  #include <unistd.h>
  #include <time.h>
--#ifndef NEWSOS4
--#ifndef STDLIBMALLOC
--#include <malloc.h>
--#endif
--#endif
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC && !defined MACOSX
++#if !defined STDLIBMALLOC
+ #include <malloc.h>
+ #endif
  #ifdef CPP_PATH
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -52,7 +47,7 @@ static int calc_pascha(int);
+@@ -50,7 +50,7 @@ static int calc_pascha(int);
  extern int yyparse(void);
  
  
--#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)
-+#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||defined(__DragonFly__)
+-#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||defined(MACOSX)
++#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||defined(MACOSX)||defined(__DragonFly__)
  int yylineno;
  #else
  extern int     yylineno;              /* current line # being parsed */
Index: pkgsrc/time/plan/patches/patch-aj
diff -u pkgsrc/time/plan/patches/patch-aj:1.3 pkgsrc/time/plan/patches/patch-aj:1.4
--- pkgsrc/time/plan/patches/patch-aj:1.3       Wed Aug  8 21:07:49 2007
+++ pkgsrc/time/plan/patches/patch-aj   Sun May 17 07:09:37 2026
@@ -1,14 +1,13 @@
-$NetBSD: patch-aj,v 1.3 2007/08/08 21:07:49 joerg Exp $
+$NetBSD: patch-aj,v 1.4 2026/05/17 07:09:37 vins Exp $
 
---- daycalc.c.orig     2007-08-08 20:41:35.000000000 +0000
+--- daycalc.c.orig     2017-10-17 06:29:05.000000000 +0000
 +++ daycalc.c
-@@ -8,9 +8,6 @@
+@@ -8,7 +8,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
--#if !defined NEWSOS4 && !defined STDLIBMALLOC
--#include <malloc.h>
--#endif
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC && !defined MACOSX
++#if !defined STDLIBMALLOC
+ #include <malloc.h>
+ #endif
  #include <time.h>
- #include <Xm/Xm.h>
- #include "cal.h"

Index: pkgsrc/time/plan/patches/patch-ak
diff -u pkgsrc/time/plan/patches/patch-ak:1.1 pkgsrc/time/plan/patches/patch-ak:1.2
--- pkgsrc/time/plan/patches/patch-ak:1.1       Wed Aug  8 21:07:49 2007
+++ pkgsrc/time/plan/patches/patch-ak   Sun May 17 07:09:37 2026
@@ -1,16 +1,14 @@
-$NetBSD: patch-ak,v 1.1 2007/08/08 21:07:49 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2026/05/17 07:09:37 vins Exp $
 
---- help.c.orig        2007-08-08 20:42:55.000000000 +0000
+--- help.c.orig        2017-10-17 06:29:05.000000000 +0000
 +++ help.c
-@@ -17,11 +17,6 @@
+@@ -17,9 +17,6 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <time.h>
--#ifndef NEWSOS4
--#ifndef STDLIBMALLOC
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC && !defined MACOSX
 -#include <malloc.h>
 -#endif
--#endif
  #include <Xm/Xm.h>
  #include <Xm/DialogS.h>
  #include <Xm/Form.h>

Added files:

Index: pkgsrc/time/plan/patches/patch-al
diff -u /dev/null pkgsrc/time/plan/patches/patch-al:1.1
--- /dev/null   Sun May 17 07:09:37 2026
+++ pkgsrc/time/plan/patches/patch-al   Sun May 17 07:09:37 2026
@@ -0,0 +1,48 @@
+$NetBSD: patch-al,v 1.1 2026/05/17 07:09:37 vins Exp $
+
+--- daemon.c.orig      2017-10-17 07:39:06.000000000 +0000
++++ daemon.c
+@@ -42,7 +42,11 @@ typedef int         Boolean;                /* open Motif */
+ #ifdef __EMX__
+ #include <io.h>
+ #else
++#ifndef NOUTMPX
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif /* UTMPX */
+ #endif
+ #ifdef AIXV3
+ struct utmp *getutent();
+@@ -266,12 +270,12 @@ int main(
+               refresh_lock(resolve_tilde(PLANDLOCK));
+               logged_in = FALSE;
+               if (pw) {
+-#if defined(SUN) || defined(BSD) || defined(__FreeBSD__)
++#ifdef NOUTMPX 
+                   struct utmp ut;
+                   int         fd;
+                   int         l;
+ 
+-                  fd = open("/etc/utmp", 0);
++                  fd = open("/var/run/utmp", 0);
+                   if (fd >= 0) {
+                       while ((l = read(fd, &ut, sizeof(ut))) == sizeof(ut)) {
+                           if (ut.ut_name[0]                   &&
+@@ -285,13 +289,11 @@ int main(
+                       }
+                       close(fd);
+                   }
+-#elif defined(ULTRIX) || defined(MACOSX)
+-                  logged_in = TRUE;
+ #else
+                   short pid = getpid();
+-                  struct utmp *u;
+-                  setutent();
+-                  while ((u = getutent()))
++                  struct utmpx *u;
++                  setutxent();
++                  while ((u = getutxent()))
+                       if (u->ut_type == USER_PROCESS &&
+                           u->ut_pid != pid &&
+                           !strncmp(pw->pw_name, u->ut_user, 8)) {
Index: pkgsrc/time/plan/patches/patch-am
diff -u /dev/null pkgsrc/time/plan/patches/patch-am:1.1
--- /dev/null   Sun May 17 07:09:37 2026
+++ pkgsrc/time/plan/patches/patch-am   Sun May 17 07:09:37 2026
@@ -0,0 +1,68 @@
+$NetBSD: patch-am,v 1.1 2026/05/17 07:09:37 vins Exp $
+
+--- sublist.c.orig     2017-10-17 06:29:05.000000000 +0000
++++ sublist.c
+@@ -20,21 +20,9 @@
+ #define CHUNK         100                     /* sublist allocation unit */
+ 
+ #ifndef NOREGEX
+-#if defined(linux)
+ #include <regex.h>
+-#else
+-#define regex_t char
+-#endif
+-#if defined(SUN) && !defined(SOLARIS2)
+-#define regcmp re_comp
+-#define regex re_exec
+-extern char           *regcmp(), *regex(), *__loc1;
+-#endif
+-#if defined(__EMX__) || defined(__FreeBSD_kernel__)
+-#define regcmp regcomp
++#define regcmp(a, b) regcomp(a, b, REG_BASIC)
+ #define regex regexec
+-extern char           *regcmp(), *regex(), *__loc1;
+-#endif
+ #endif
+ extern int            search_mode;            /* 0=case, 1=lit, 2=regex */
+ extern struct user    *user;                  /* user list (from file_r.c) */
+@@ -93,12 +81,8 @@ void create_sublist(
+ #ifndef NOREGEX
+               regex_t *preg = 0;
+               if (search_mode == 2) {
+-#if defined(linux)
+                       preg = (regex_t *)malloc(sizeof(regex_t));
+                       if (regcomp(preg, key, 0)) {
+-#else
+-                      if (!(key = regcmp(key, 0))) {
+-#endif
+                               free(preg);
+                               list->locked--;
+                               return;
+@@ -114,12 +98,8 @@ void create_sublist(
+                           append_entry(&w->sublist, ep);
+ #ifndef NOREGEX
+               if (search_mode == 2) {
+-#if defined(linux)
+                       regfree(preg);
+                       free(preg);
+-#else
+-                      free(key);
+-#endif
+               }
+ #endif
+               if (search_mode == 1)
+@@ -215,14 +195,7 @@ static BOOL keymatch(
+ 
+ #ifndef NOREGEX
+         case 2: {
+-#if defined(linux)
+               return(regexec(preg, string, 0, 0, 0) == 0);
+-#else
+-              char dummy[1024];
+-              return(regex(key, string,
+-                              dummy, dummy, dummy, dummy, dummy,
+-                              dummy, dummy, dummy, dummy, dummy) != 0);
+-#endif
+               }
+ #endif
+       }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index