CVS commit: pkgsrc/time/sunclock

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Dec  9 14:13:00 UTC 2022

Modified Files:
        pkgsrc/time/sunclock: Makefile PLIST distinfo
        pkgsrc/time/sunclock/patches: patch-aa patch-ab
Added Files:
        pkgsrc/time/sunclock/patches: patch-Imakefile patch-editkit_Imakefile
            patch-editkit_edit.c patch-readpng.c patch-readvmf.c
            patch-sunclock.h patch-version.h patch-widgets.c

Log Message:
time/sunclock: update to sunclock-3.57.

Major update (see below):

# Local Changes:
* Package now honors pkgsrc CFLAGS and LDFLAGS.
* Improved DESTDIR handling, previously resulting in some files not -
  being installed.
* Fixed a series of bugs, small quirks, and compiler warnings (see -
  comments in patches)
* Introduced new required dependencies.
* Added missing LICENSE.
* Taking maintainership.

# Changes (upstream):

==============================================================================
All revisions from version 1.4 to version 3.xx are by
Jean-Pierre Demailly, demailly%fourier.ujf-grenoble.fr@localhost
==============================================================================

Version 3.57 August 22, 2008

- Included patch from Thomas M.Ott <thmo-13%gmx.de@localhost> : improvement of
  German localization and management of gzip-compressed *.vmf files.
- Corrected minor defects in timezones.vmf
- Fixed somewhat -reformat option.
- Imakefile change : VMF files now installed compressed by default.

Version 3.56 June 22, 2006

- Minor bug fixes (segfault bug in -mostly obsolete?- colorlevel 0)
- added -zoomimage <file> (zoom image file) as new command line option
  so as to change the vmf file used in the zoom widget.

Version 3.55 June 18, 2006

- The default clock/map image file is now 'timezones.vmf'
- Added the new vector map file 'countries.vmf' (political boundaries)
- Added some code in readvmf.c for more verbose information
- Added 'zoomwidth' and 'zoomheight' as new options in VMF format
- Completely reworked the explanations on the VMF format file in VMF.txt
- Change default zoom mode to 0 (=no attempt to correct aspect ratio
  as default behaviour)
- Corrected minor bug in the mouse tracking procedure for area selection.
- Installing now 'emx' in sunclock's SHAREDIR/bin subdirectory, in order to
  avoid possible conflicts with 'emx' from the xrmap package.

Version 3.54 July 29, 2005

- Corrected segfault bug #315462 from Debian bug tracking system
- Improved look of 3D buttons
- xterm or terminal-emulator no longer needed since sunclock now
  includes its own utility (emx, a very small emacs clone...)

Version 3.53 November 22, 2004

- All menus now use buttons with a 3D look
- Key shortcut hints have been substantially improved
- New option -image
- VMF format has been slightly enhanced (allows text labels)
- Corrected further GUI bugs
- Command line options -jump and -progress should now work.

Version 3.52 October 9, 2004

- Corrected many small GUI bugs or annoyances. Thanks to Jamie Zawinski
  <jwz%jwz.org@localhost> for pointing out some of them and for useful advice.

Version 3.51 August 27, 2004

- New release, jumped version number to 3.51 because of substantial
  improvements made
- Added support for reading GIF and PNG images :
  readgif.c & readpng.c, snarfed from xpaint's rw/ routines.
  Sunclock now requires libpng (GIF is read by ad hoc routines)
- Added a .spec file to enable building rpm packages, thanks to
  Fran�ois Massonneau <frmas%free.fr@localhost>
- Added Polish localization, thanks to Cezary Morga <cezarym%pf.pl@localhost>
- improved -setfont option, to take into account language specific
  font settings

Version 3.50pre3 August 4, 2004

- Added AM/PM indicator, 12/24 hour in date/time format
  (patch by James Turner <turner%blackbear.com@localhost>,
   ** Senior Editor of LinuxWorld Magazine **)

Version 3.50pre2 June 30, 2004

- Improvement of internal file explorer
- Zooming can now be achieved by selecting an area with right mouse button
  and/or by static click which still pops up the zoom window as before
- Various updates to Sunclockrc and .vmf files

Version 3.50 was never declared to be released in final form...
  so that should have been 3.50pre1, which is quite stable.

Version 3.50pre1, August 13, 2001

- Created "xrmap", derived from Reza Naima's vector map software "rmap".
  This allows (or will allow) to build very accurate .vmf maps.
  (A much better integration with sunclock should come at some point...)
- Introduced the /tools directory
- Sunclock can now read compressed .vmf.gz files (and uses the zlib
  library for that purpose)
- Created the timezones.vmf vector map, showing time zones (and/or nation
  boundaries in near future :-)
- Changes in the VMF format to accomodate numerous new possibilities.
- Corrected a long standing bug in readvmf.c
- New -reformat option, useful to reformat .vmf files according to syntax
  and standard line width.

Version 3.46, July 5, 2001

- New -screensaver option (that turns sunclock into a screensaver, when
  used e.g. with Jamie Zawinski's xscreensaver...)
- New options -randomrootpos -fixedrootpos -rootdx -rootdy which
  determine the behaviour of the screensaver functionality
- New option -vmfcolors <list_of_colors> from which one can change
  interactively the list of predefined colors in a .vmf file
- Fixes in the behaviour of auxiliary windows under opening or closing
  the main maps (iconification/deiconification and so on...)

Version 3.45v2, June 28, 2001

- Severe bug corrected: sunclock-3.45 was segfaulting after any
  click on a random point of the map (in solar time mode)
  Thanks to David Ronis <ronis%ronispc.chem.mcgill.ca@localhost> for
  tracking down that bug.
- Another less severe bug fixed: the root window refresh procedure now
  works even when the main window is iconified (it is actually
  recommended to iconify any window which is to be mapped on the
  root window...)
- The background color of the root window on which stars are drawn
  can now be chosen at will. For instance
    -setcolor "star|yellow" -setcolor "root|grey20"
  sets yellow stars on a grey20 sky. This thing also corrects possible
  garbage that would otherwise have been drawn in the Pixmap texture.
- Any city which is preselected via the -city <name> option still appears
  even if its category is a priori to small to let it being displayed
  for the given -sizelimits (suggestion by Fran�ois Massonneau).
- The -addcity option now tolerates the modification of a city (any city
  already listed with the same name and coordinates up to 0.5 degree
  is replaced from the list - a warning is issued, however - that warning
  disappears if the city is first removed with -removecity).
  Change suggested by Ted Rolle <ted%acacia.datacomm.com@localhost>

Version 3.45, June 27, 2001

- Sunclock can write periodically onto the root window with a specified
  frequency (related new option -rootperiod <value>)
- A new animation mode has been introduced to modify the speed of
  time evolution (this is handled by a new option -animateperiod <value>).
- The keys G J [ ] ' are used to handle these new features from the
  Option window.
- Hong Kong coordinates have been fixed to their correct values,
  thanks to Stefan Recksiegel <stefan%post.kek.jp@localhost>
- Urban and Option windows no longer have erratic sizes when switching
  the map/clock modes, and the Menu window should be correctly refreshed.
- A 5th city category has been introduced (suggestion by F.Massonneau,
  <frmas%free.fr@localhost>). By default, spotsizes now range from 1 (largest cities)
  to 5 (towns or villages), instead of from 4 to 1 (the illogical ordering
  has been reversed - users who haven't tweaked their city parameters
  shouldn't see the change).
- When a small city is selected (beyond the category of cities normally
  displayed on the map), it is now shown, whatever the size is.
- Some XEvent fixes (e.g. in clear bottom strip routine, and when
  iconifying/deiconifying windows).

Version 3.44, June 22, 2001

- Sunclock is now able to write the map to the root window, and presents
  a starry sky beyond the limits of the map.
- The syntax of color options has changed. A unique option
  "-setcolor field|color" can be used instead. This single change reduced
  the size of the binary code by 1.5 kB !!
  Similarly, options -monochrome, -invertcolors and -fullcolors have been
  replaced by a single option -colorlevel <value> (0, 1, 2, 3) [thus there
  is a new color level as well, see man page]
- Italian dialogs have been updated, thanks to Alessio F. Bragadini
  <alessio%sevenseas.org@localhost>
- The code has been cleaned-up a little bit and should consume slightly
  less memory, perhaps at the expense of slightly more CPU power.
- Search of city works with respect to city names as well as with
  coordinates (when name entry is left empty).
- A lot of minor bug fixes

Version 3.43, June 14, 2001

- Larger data base of cities/coordinates, with level of size
  New related options -spotsizes -sizelimits -citycategories -citycheck
  (The upshot is that the size of the spot representing a city can change
  according to the importance of the city, and that not all cities are
  shown if the zoom factor is too small.)
- Bug fixes: segfault occurring when playing around with the urban selector
  (only when the clock geometry was set too small...); marked cities still
  appeared when opening other windows: this was actually fixed by
  suppressing an unneeded flag, thus reducing the memory usage...
- The city search now really works !
- A warning is issued when the user tries to create an already existing city.
- The "Urban widget" is now stretchable.

Version 3.42, June 11, 2001

- New "Urban widget", which allows to easily search, introduce, erase or
  modify city locations at runtime
- Change of format for the Sunclockrc and ~/.sunclockrc config files.
  They now make use of the new -addcity option to enter (or remove) cities.
  *Both* are read (with ~/.sunclockrc being read later, so that it
  overrides the system wide Sunclockrc)
- The -position option now allows degrees, minutes, seconds format
- Fixes in option handling (hopefully fixing infamous segfault
  crashes when options were activated from the Option widget)

Version 3.41, May 31, 2001

- New fixes for X BadAccess bug with enlightenment (again!)
- New options -bottomline, -nobottomline. By default, no bottom line
  appears in the newer version (looks nicer to me!)
- Improvement of the -dock mode; new -undock option. Fixes for the
  enlarge '>' command; new related -extrawidth option.
- Synchronization fixes in multi-window context
- Minor bugs corrected: parallel/tropic color setting now works, readvmf
  should no longer produce artefacts on the left border when the
  magnification factor is larger than 1; speed slightly improved as well.
- The Moon is now shown on the map (although not astronomically very
  accurate, probably a few minutes of arc of error...)
  Related new options -moon, -nomoon, -objectmode x.
- Sun and Moon coordinates can be shown on the map by typing 'y' once more

Version 3.40, May 14, 2001

- City names and coordinate values can now be shown on the map
  by typing 'u' once more
- Bitmaps of city/mark spots are now obtained from explicit data
  in bitmaps.h rater than calls to X routines (slower and more rigid)
- Menu options which can take more than 2 values (e.g. 'N') can get
  their values rotated in both directions by using lower/upper cases
  or clicking with the left/right mouse button.
- Removed the sunclock_help script, replaced by an internal call
- Much improved refresh mechanism for -fullcolors mode. Flickering
  should not occur any longer in that mode (still somewhat unavoidable
  with obsolete mode -invertcolors)
- Corrected a X BadAccess bug showing up under some window managers
  (e.g. enlightenment)

Version 3.38, April 17, 2001

- Added new color and font options
- The man page is installed automatically and is accessible from the GUI
  (type key 'h' twice)
- The option handling mechanism has been improved:
  the ~/.sunclockrc config file as well as the option widget now accept
  several options simultaneously on the same line.

Version 3.37, April 13, 2001

- Added new option -lightgradient
- Corrected and improved somewhat the shading algorithm (while slightly
  improving speed as well).

Version 3.36, April 13, 2001

- Code clean-ups and bug fixes. Language and fonts are now runtime
  configurable as promised (and without segfaulting !).
- When changing parameters, the XImage is recycled whenever possible.

Version 3.35, April 11, 2001

- A new "Option" widget appears; many command line options can be set
  interactively at runtime from the option window.
- The bigendian property is checked at runtime on the X display, not
  just at compile time (the older way made sense only if the X display
  and X server were both of the same endian nature!)
- Zoom colors are now configurable
- Code clean-ups
- Bug fixes

Version 3.34, March 30, 2001

- Huge improvements in the zoom widget: a black and white map is now used
  as a texture for guiding the moves; there is also a switch for
  synchronizing or desynchronizing the zoom events.
- Several other new zoom functions (*, &, #, +, -, arrow keys...)
- A lot of minor bug fixes

Version 3.33, March 21, 2001

- New improvements in the zoom widget, following suggestions by Fran�ois
  Massonneau <frmas%free.fr@localhost> and Ted Rolle <ted%acacia.datacomm.com@localhost> :
  there is now a special mode allowing to keep control on the aspect
  when changing the zoom area location.
- Update of Dutch localization by Henry Verdonschot <henry%procura.nl@localhost>
  and of Italian localization by Alessio F. Bragadini <alessio%sevenseas.org@localhost>
- Bug fixes.

Version 3.32, March 19, 2001

- Fully functional zoom widget; all images are now zoomable in the
  range 1 ... 100.00 (this does not always make sense, as most JPEG
  images have insufficient resolution for magnifications exceeding 5)
- More efficient moveNightArea algorithm, resulting in a substantial
  speed improvement when using keys A, B
- Various clean-ups; new flag flag.update allowing a more elegant
  updating process
- Some other minor GUI improvements in menus or events (X Keys now
  handled properly...)
- Bug fixes

Version 3.31, March 3, 2001

- Minor GUI improvements: the clock window now also has a menu toolbar,
  and the file selector has been slightly improved.
- One or two minor bugs have been fixed (obscure mistake in management of
  pointers, when the initial window was closed before the later ones...)
- A new (unfinished) widget appears: the zoom window - please wait for the
  next release 3.32 for complete zooming capabilities!

Version 3.30, February 26, 2001

- Extensive support for PseudoColor displays, with private colormaps
  being allocated automatically and quantization of colors being performed
  when needed
- .jpg and .xpm formats are fully supported, and all images are resizable

Version 3.29, February 12, 2001 (not widely announced)

- Sunclock now reads .jpg image formats in true-color modes
- .jpg images are resizeable
- The internal vector map has been turned into an externally loadable
  map (a ".vmf" format)

Version 3.28, January 15, 2001

- Patch in setTZ routine for HP-UX systems (should use putenv(strdup(buf))
  instead of putenv(buf)). Suggested by Henry Verdonschot <henry%procura.nl@localhost>
- The text output in the bottom strip of the clock is now customizable via
  a format string; idea based on a suggestion by Henry Verdonschot
- Dutch localization (Henry Verdonschot again)
- Norwegian localization; made by Johnny Ljunggren <johnny%navtek.no@localhost>
- Synchronize (don't synchronize) switch via "!" at runtime.

Version 3.27, December 29, 2000

- New options -dock (initial clock window cannot be resized or closed),
  and -updateall (all windows are updated, which, of course, requires
  more CPU)
- Fixes multiple window bug found by Fran�ois Massonneau <frmas%free.fr@localhost>

Version 3.26, December 22, 2000

- Fixes segfault bug mentioned by Fran�ois Massonneau <frmas%free.fr@localhost>

Version 3.25, December 21, 2000

- Simultaneous windows (in arbitrary number...)
  All this required a lot of changes in the Sundata structures, which
  now carry all information about the status of various maps. This
  should make everything much more flexible...
- As a corollary, sunclock should now be dockable

Version 3.22, December 12, 2000 (not released...)

- Fixed incorrect (zero!) distance calculations, minor bug noticed by
  Marc Colling (mcol%village.uunet.lu@localhost)

Version 3.21, December 4, 2000

- Bug fixes in the window placement routines (as suggested by Roland
  Rosenfeld)
- Various improvements in the shading algorithm

Version 3.20, November 24, 2000

- Sunclock includes vector map routines which generate Earth maps on the fly.
- These maps are resizeable, they can generate contours or filled areas
  (3 fill/contour options...)
- Sunclock can optionally handle (non resizeable) external pixmaps as well
- Resizing routines for map and clock windows.
- Shading algorithm showing twilight / luminosity

Version 3.13, October 26, 2000.

- The sunclock package now includes a vector map of the Earth (loosely
  derived from the xearth package by Kirk Lauritz Johnson). The clock and
  map data files are built from there by the `mapgen` utility. This
  allows users to select the respective size of the clock and map windows
  at compile time (not yet at run time :-(  but should come soon...)
- New "night/no night" options
- Coordinates can now appear in decimal degrees or degrees, minutes, seconds
- Various small GUI fixes (window placement again...)

Version 3.12, October 9, 2000.

- Fix for a bug affecting the configuration of language and color settings
  through the config file.

Version 3.11, October 8, 2000.

- Italian localization by Alessio Bragadini <alessio%sevenseas.org@localhost>
  Spanish localization by Pedro Gimeno <pgimeno%iname.com@localhost>
- Improved window placement, as suggested by
  Pascal Jermini <Pascal.Jermini%epfl.ch@localhost>
- Merged patch by Pedro Gimeno, implementing the wm_delete_window
  protocol.
- Corrected calculation of solartime, sunrise and sunset, which was
  sometimes inaccurate by 10-15 minutes or more.
  Notified by Orn E. Hansen <oe.hansen%gamma.telenordia.se@localhost>
- Fix in setTZ routine, related to the putenv/setenv duality
  Thanks to Roland Rosenfeld <roland%spinnaker.de@localhost> for this.
  Hopefully this fixes the persistent problems with timezones...
- Merged window-manager icons from the Debian sources.
- New command line options added (-rcfile -language -jump -progress -menu
  among others). Time progress and configuration file can now be set
  arbitrarily.
- The command line options can now also be set through the configuration
  file, and the version number appears in the tips of 'H' option
  Suggestions by Fran�ois Massonneau <frmas%free.fr@localhost>

Version 3.10, October 3, 2000.

- Interface has been improved and should be substantially easier to use,
  following some suggestions by Fran�ois Massonneau <frmas%free.fr@localhost>
- Added Sun position functionality
- Added "hour extension" mode
- Swedish localization by <janoh%telia.com@localhost>
- Fixes in monochrome mode
- Other small changes, including bug fixes ( timezone problem, notified by
  Dimitri Papadopoulos-Orfanos <papadopo%shfj.cea.fr@localhost> )

Version 3.04, September 7, 2000.

- Fixed tzset() problems on some systems (Linux-Mandrake...) by always
  calling tzset() before each localtime() call.
  Notified by Andy Barlak <andyb%eskimo.com@localhost> and
  <dicw%kalevanet.sointula.bc.ca@localhost> )

Version 3.03, September 5, 2000.

- Corrected local timezone bug (wasn't correctly initialized nor reset)
  Problem notified by Philippe Le Hegaret <plh%w3.org@localhost>
- Added "1 minute" as one of possible values of progression time
- The value of the sun apparent diameter was wrong (too large) and thus
  produced slightly inaccurate day length values!
- Fix for SunPro compiler
  by Dimitri Papadopoulos-Orfanos <papadopo%shfj.cea.fr@localhost>

Version 3.02, September 4, 2000.

- Corrected segmentation fault problem, occurring when environment variable
  LANG was not set (patch from Joerg Plate <Joerg%Plate.cx@localhost>)
- Fixed behaviour of window placement, which was somewhat unsatisfactory
- Slight code change for the sake of Solaris compatibility
- Improved sunclock.man, Imakefile and Makefile.noimake
- Added horizontal scroll for bottom text line
- Merged German app-default file provided by several German users
  (including the Debian maintainer Roland Rosenfeld <roland%spinnaker.de@localhost>)

Version 3.01, August 31, 2000.

- Added command line options -map and -clock
- A lot of compilation fixes, notified by Andy Barlak <andyb%eskimo.com@localhost>
- Makefile.noimake improved

Version 3.00, August 26, 2000.

Complete rewrite of the GUI, many bug corrections, improvements and
new functions, resulting in a much more powerful program.

- Added keyboard and mouse controls
- Added command line and inline help
- Added switches: coordinates, distances, legal time, solar time
- Added marks, equator, tropic & arctic circles
- Time can be quickly modified forward and backward, so that
  the evolution of sun illumination and seasons can be observed
- Improved time management routines
- Improved and debugged monochrome mode

Version 2.1, June 6, 2000.

- Updated coordinates.txt with a better source
  (http://www.ecf.toronto.edu/~mao/)

Version 2.0, April 21, 2000.

- Added XFlush in doTimeout to force update (for LinuxPPC...)

Version 1.9, January 21, 2000.

- Iconic stuff fixed again (didn't work for all WM)

Version 1.8, August 20, 1999.

- Fixed small bug in mono mode

Version 1.7, August 17, 1999.

- Added Calculation of city distances

Version 1.6, March 28, 1999.

- Fixed iconic stuff, which did not seem to work properly (at least on
  my system...)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/time/sunclock/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/sunclock/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/time/sunclock/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/time/sunclock/patches/patch-Imakefile \
    pkgsrc/time/sunclock/patches/patch-editkit_Imakefile \
    pkgsrc/time/sunclock/patches/patch-editkit_edit.c \
    pkgsrc/time/sunclock/patches/patch-readpng.c \
    pkgsrc/time/sunclock/patches/patch-readvmf.c \
    pkgsrc/time/sunclock/patches/patch-sunclock.h \
    pkgsrc/time/sunclock/patches/patch-version.h \
    pkgsrc/time/sunclock/patches/patch-widgets.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/sunclock/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/sunclock/patches/patch-ab

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

Modified files:

Index: pkgsrc/time/sunclock/Makefile
diff -u pkgsrc/time/sunclock/Makefile:1.17 pkgsrc/time/sunclock/Makefile:1.18
--- pkgsrc/time/sunclock/Makefile:1.17  Mon Oct  8 13:04:29 2012
+++ pkgsrc/time/sunclock/Makefile       Fri Dec  9 14:13:00 2022
@@ -1,17 +1,31 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 13:04:29 asau Exp $
+# $NetBSD: Makefile,v 1.18 2022/12/09 14:13:00 vins Exp $
 #
 
-DISTNAME=      sunclock-1.5
-PKGREVISION=   2
-CATEGORIES=    x11 time
-MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/}
+DISTNAME=      sunclock-3.57
+CATEGORIES=    time x11
+MASTER_SITES=  https://raw.githubusercontent.com/nongiach/Sunclock/f4106eb0a81f7594726d6b2859efd8fc64cc1225/
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    vins%NetBSD.org@localhost       
 COMMENT=       Show which portion of the Earth's surface is illuminated by the Sun
+LICENSE=       gnu-gpl-v2
 
 USE_IMAKE=     yes
 
+MAKE_FLAGS+=   DESTDIR=${DESTDIR}
+MAKE_FLAGS+=   BINDIR=${PREFIX}/bin
+MAKE_FLAGS+=    SHAREDIR=${PREFIX}/share/sunclock
+MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}/man1
+
+MAKE_FLAGS+=   CDEBUGFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=   PROJECT_DEFINES=${CPPFLAGS:Q}
+MAKE_FLAGS+=   EXTRA_LDOPTIONS=${LDFLAGS:Q}
+
 CPPFLAGS.SunOS+=       -DUSE_PUTENV
 
+.include "../../graphics/png/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/sunclock/PLIST
diff -u pkgsrc/time/sunclock/PLIST:1.2 pkgsrc/time/sunclock/PLIST:1.3
--- pkgsrc/time/sunclock/PLIST:1.2      Mon Mar  3 03:23:25 2003
+++ pkgsrc/time/sunclock/PLIST  Fri Dec  9 14:13:00 2022
@@ -1,3 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:23:25 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/12/09 14:13:00 vins Exp $
+bin/emx
 bin/sunclock
-${IMAKE_MAN_DIR}/sunclock.${IMAKE_MANNEWSUFFIX}
+man/man1/sunclock.1
+share/sunclock/Sunclockrc
+share/sunclock/earthmaps/vmf/countries.vmf.gz
+share/sunclock/earthmaps/vmf/landwater.vmf.gz
+share/sunclock/earthmaps/vmf/timezones.vmf.gz
+share/sunclock/editkit/MANUAL.emacs
+share/sunclock/editkit/README
+share/sunclock/editkit/emxrc
+share/sunclock/i18n/Sunclock.de
+share/sunclock/i18n/Sunclock.en
+share/sunclock/i18n/Sunclock.es
+share/sunclock/i18n/Sunclock.fr
+share/sunclock/i18n/Sunclock.it
+share/sunclock/i18n/Sunclock.nl
+share/sunclock/i18n/Sunclock.no
+share/sunclock/i18n/Sunclock.pl
+share/sunclock/i18n/Sunclock.sv

Index: pkgsrc/time/sunclock/distinfo
diff -u pkgsrc/time/sunclock/distinfo:1.9 pkgsrc/time/sunclock/distinfo:1.10
--- pkgsrc/time/sunclock/distinfo:1.9   Tue Oct 26 11:24:37 2021
+++ pkgsrc/time/sunclock/distinfo       Fri Dec  9 14:13:00 2022
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:24:37 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/12/09 14:13:00 vins Exp $
 
-BLAKE2s (sunclock-1.5.tar.gz) = fe72f50fa8b436b1ee484fc337a4a0fba8fd4dc1c5e61de5936a991c4acbf7c2
-SHA512 (sunclock-1.5.tar.gz) = a88ebb080915ed9da542ce0657999eba344ba66ae7521a9ae918a1d5a49044c190e7f2ce75a353e7fcdd8c5f9c50dc2a6da80f205d89f20428e29d048f3c3f64
-Size (sunclock-1.5.tar.gz) = 29360 bytes
-SHA1 (patch-aa) = 775b77c0bd2ebbdcaa114b8be95af553521a7ec7
-SHA1 (patch-ab) = e3432958d8e302643bb751717d3a8462bd0a841b
+BLAKE2s (sunclock-3.57.tar.bz2) = fa7713e5b1bd87851c64919e59deb07601c93aed1820fb4b6fea87903d664f56
+SHA512 (sunclock-3.57.tar.bz2) = cfb99ecf29d9230335af59d0e6056d51c9922a50e8749708f237676cd81f346de66b66801079b6032880b88ba8242432dc8cb65c51c866577e0be51be30cb13a
+Size (sunclock-3.57.tar.bz2) = 1325138 bytes
+SHA1 (patch-Imakefile) = f1cc0a5d4c8462b1667b50247881baca44ca0b72
+SHA1 (patch-aa) = ce0aa1b588e18a2238e36689ede63d1d30bb5a4b
+SHA1 (patch-ab) = a299fd897511acf4238d14c5432d7ea467c9756f
+SHA1 (patch-editkit_Imakefile) = 697c48887a706a0211b2a0fdfd6fd042d99085f8
+SHA1 (patch-editkit_edit.c) = ed6bde0c2740547593c4813c7030abc7a4afbada
+SHA1 (patch-readpng.c) = 7c0d3a17be546bb158bc525aae9158c4472e0cfd
+SHA1 (patch-readvmf.c) = ce94c97ece858f963fcbc7f08a3551425667a38b
+SHA1 (patch-sunclock.h) = 2e45807196e1b5a48602f80bc842d87b435c0574
+SHA1 (patch-version.h) = 0c743fc66a578f847704203ffb0b78f050cf30d3
+SHA1 (patch-widgets.c) = e7c1f0a5f5cf83209ce989f258b651d31279c51e

Index: pkgsrc/time/sunclock/patches/patch-aa
diff -u pkgsrc/time/sunclock/patches/patch-aa:1.2 pkgsrc/time/sunclock/patches/patch-aa:1.3
--- pkgsrc/time/sunclock/patches/patch-aa:1.2   Sat Aug 30 08:25:27 2008
+++ pkgsrc/time/sunclock/patches/patch-aa       Fri Dec  9 14:13:00 2022
@@ -1,25 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2008/08/30 08:25:27 dholland Exp $
+$NetBSD: patch-aa,v 1.3 2022/12/09 14:13:00 vins Exp $
 
---- tildepath.c.orig   1998-03-29 16:08:21.000000000 -0500
-+++ tildepath.c        2008-08-30 04:18:54.000000000 -0400
-@@ -37,7 +37,6 @@ static char SccsId[] = { "@(#) tildepath
+Don't make own declaration of strdup().
+
+--- tildepath.c.orig   2000-09-01 15:34:51.000000000 +0000
++++ tildepath.c
+@@ -38,7 +38,6 @@ T* AUTHOR
  #include <stdio.h>
  #include <stdlib.h>
  #include <pwd.h>
 -#include <malloc.h>
  #include <string.h>
- #include <unistd.h>
  
-@@ -68,12 +67,6 @@ char *path;         /* Path starting with ~ */
-     int size;         /* Length of new path */
+ /*
+@@ -71,8 +70,6 @@ char *path;          /* Path starting with ~ */
+      * Functions
+      */
  
-     /*
--     * Functions
--     */
+-    /*    char *strdup();     */      /* Make a copy of a path */
 -
--    char *strdup();           /* Make a copy of a path */
--
--    /*
+     /*
       * If the path doesn't start with ~ quit right now
       */
- 

Index: pkgsrc/time/sunclock/patches/patch-ab
diff -u pkgsrc/time/sunclock/patches/patch-ab:1.1 pkgsrc/time/sunclock/patches/patch-ab:1.2
--- pkgsrc/time/sunclock/patches/patch-ab:1.1   Sat Aug 30 08:25:27 2008
+++ pkgsrc/time/sunclock/patches/patch-ab       Fri Dec  9 14:13:00 2022
@@ -1,38 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2008/08/30 08:25:27 dholland Exp $
+$NetBSD: patch-ab,v 1.2 2022/12/09 14:13:00 vins Exp $
 
---- sunclock.c~        1999-04-07 10:00:49.000000000 -0400
-+++ sunclock.c 2008-08-30 04:24:42.000000000 -0400
-@@ -102,13 +102,13 @@ struct sunclock {
-       short *         s_wtab1;        /* current width table (?) */
-       short *         s_wtab;         /* previous width table (?) */
-       long            s_increm;       /* increment for fake time */
--      long            s_time;         /* time - real or fake, see flags */
-+      time_t          s_time;         /* time - real or fake, see flags */
-       GC              s_gc;           /* GC for writing text into window */
-       char *          (*s_tfunc)();   /* function to return the text */
-       char            s_text[80];     /* and the current text that's there */
-       int             s_textx;        /* where to draw the text */
-       int             s_texty;        /* where to draw the text */
--      long            s_projtime;     /* last time we projected illumination */
-+      time_t          s_projtime;     /* last time we projected illumination */
-       int             s_timeout;      /* time until next image update */
-       int             s_win_offset;   /* offset for drawing into window */
-       struct sunclock * s_next;       /* pointer to next clock context */
-@@ -720,7 +720,7 @@ void
- setTimeout(s)
- register struct sunclock *    s;
- {
--      long                    t;
-+      time_t                  t;
- 
-       if (s->s_flags & S_ICON) {
-               if(!AnimateIcon) {
-@@ -1297,7 +1297,7 @@ SetIconName()
-    */
- 
-     char name[128];/* Used to change icon name */
--    long c;   /* Current time on the clock */
-+    time_t c; /* Current time on the clock */
-     struct tm *lt; /* Used to get timezone name */
+Fix y2038 bugs; time_t != long
+
+--- sunclock.c.orig    2008-08-07 12:40:24.000000000 +0000
++++ sunclock.c
+@@ -127,7 +127,6 @@
+  *  external routines
+  */
  
-     /* Change the timezone displayed in the icon */ 
+-extern long     time();
+ #ifdef NEW_CTIME
+ extern char *   timezone();
+ #endif

Added files:

Index: pkgsrc/time/sunclock/patches/patch-Imakefile
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-Imakefile:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-Imakefile        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,68 @@
+$NetBSD: patch-Imakefile,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+DESTDIR support.
+LDFLAGS support.
+
+--- Imakefile.orig     2008-08-07 14:27:43.000000000 +0000
++++ Imakefile
+@@ -11,14 +11,14 @@ XCOMM Name of share subdirectory of DEST
+ SHAREDIR=/share/sunclock
+ 
+ XCOMM Name of library subdirectory of DESTDIR:
+-EMXBINDIR=/share/sunclock/bin
++EMXBINDIR=${BINDIR}
+ 
+ XCOMM Name of library subdirectory of DESTDIR:
+ LIBDIR=/lib/sunclock
+ 
+ XCOMM Name of DOCDIR's subdirectories of DESTDIR:
+-DOCDIR=/X11R6/lib/X11/doc 
+-DOCHTMLDIR=/X11R6/lib/X11/doc/html
++DOCDIR=${SHAREDIR}/doc 
++DOCHTMLDIR=${SHAREDIR}/doc/html
+ 
+ XCOMM
+ XCOMM Compile options:
+@@ -29,40 +29,14 @@ XCOMM   define for system V or Solaris
+ XCOMM Pick -O or -g
+ XCOMM
+ 
+-#ifdef HPArchitectureAndHPUX
+-XPMLIBDIR=-L/opt/xpm/lib/X11
+-XPMINC=-I/opt/xpm/include
+-JLIBDIR=-L/opt/jpeg-6/lib
+-ZLIBDIR=
+-JINC=-I/opt/jpeg-6/include
+-
+-CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+-#else
+-# SunOS
+-
+-#XPMLIBDIR=-L/usr/X11R6/lib
+-#XPMINC=-I/usr/X11R6/include/X11
+-#JLIBDIR=-L/usr/lib
+-#ZLIBDIR=-L/usr/lib
+-#JINC=-I/usr/include
+-#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+-
+-# Solaris, Linux
+-#XPMLIBDIR=-L/usr/X11R6/lib
+-#XPMINC=-I/usr/X11R6/include/X11
+-#JLIBDIR=-L/usr/lib
+-#ZLIBDIR=-L/usr/lib
+-#JINC=-I/usr/include
+-
+-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\"
+-#endif
++CCOPTIONS=$(LDFLAGS) -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DEMXBINDIR=\"$(EMXBINDIR)\"
+ 
+ SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
+      readvmf.c readxpm.c readgif.c readjpeg.c readpng.c
+ OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
+      readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
+ LOCAL_LIBRARIES=-lX11 $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
+-     $(JLIBDIR) -ljpeg -lpng -lm
++     $(JLIBDIR) -ljpeg -lpng16 -lm
+ DEPLIBS=              # I don't know what I'm doing, and I hate imake!
+ 
+ ComplexProgramTarget(sunclock)
Index: pkgsrc/time/sunclock/patches/patch-editkit_Imakefile
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-editkit_Imakefile:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-editkit_Imakefile        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-editkit_Imakefile,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+Do not redefine CFLAGS.
+
+--- editkit/Imakefile.orig     2006-10-14 14:37:25.000000000 +0000
++++ editkit/Imakefile
+@@ -33,7 +33,7 @@ XCOMM
+ XCOMM Compile options:
+ XCOMM
+ 
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DDOCDIR="\"$(DOCDIR)\""
++EXTRA_DEFINES = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DDOCDIR="\"$(DOCDIR)\""
+ 
+ LOCAL_LIBRARIES=-lX11
+ DEPLIBS=              # I don't know what I'm doing, and I hate imake!
Index: pkgsrc/time/sunclock/patches/patch-editkit_edit.c
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-editkit_edit.c:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-editkit_edit.c   Fri Dec  9 14:13:00 2022
@@ -0,0 +1,46 @@
+$NetBSD: patch-editkit_edit.c,v 1.1 2022/12/09 14:13:00 vins Exp $
+ 
+Prevent warnings about size mismatch in -
+pointer to integer conversion.
+
+--- editkit/edit.c.orig        2006-09-11 11:29:16.000000000 +0000
++++ editkit/edit.c
+@@ -28,6 +28,8 @@ void prrec(U_REC* undp, char indicator)
+ }
+ */
+ 
++# include <stdint.h>
++
+ /* get true x co-ord for char at 'pos' */
+ int get_tru(char* pos)
+ {
+@@ -106,7 +108,7 @@ char * realloc_buffer(int mode)
+                       ptr = realloc(unbuf, (size_t)i);
+                       if (ptr) {
+                               umax += UMAX;
+-                              i = (int)ptr - (int)unbuf;
++                              i = (int)(uintptr_t)ptr - (int)(uintptr_t)unbuf;
+                               unbuf = ptr;
+                               undop = (void*)undop+i;
+                               undosp = (void*)undosp+i;
+@@ -139,7 +141,7 @@ U_REC* new_undo(char *pos, int len)
+               tmp = (void *) unbuf;
+       }
+ 
+-      tmp->link = (unsigned int)undosp - (unsigned int)unbuf;
++      tmp->link = (unsigned int)(uintptr_t)undosp - (unsigned int)(uintptr_t)unbuf;
+       tmp->pos = pos - edbuf;
+       tmp->length = 0;
+       return tmp;
+@@ -1721,9 +1723,9 @@ void doblockr()
+               else
+                       *bb_end++ = c;
+               if (bb_end >= bb+bmax) {
+-                      d = (int)bb;
++                      d = (int)(uintptr_t)bb;
+                       realloc_buffer(1);
+-                      d = (int)bb - d;
++                      d = (int)(uintptr_t)bb - d;
+                       col += d;
+                       bb_end += d;
+               }
Index: pkgsrc/time/sunclock/patches/patch-readpng.c
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-readpng.c:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-readpng.c        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-readpng.c,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+png_check_sig() removed since libpng-1.4.
+Include missing <string.h> for memcpy().
+
+--- readpng.c.orig     2005-10-23 19:36:29.000000000 +0000
++++ readpng.c
+@@ -16,6 +16,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <png.h>
+ 
+ #include <X11/Xlib.h>
+@@ -57,7 +58,7 @@ TestPNG(char *file)  /* gets called a LO
+     fread(header, 1, 8, fp);
+     fclose(fp);
+ 
+-    return png_check_sig(header, 8);
++    return !png_sig_cmp(header, 0, 8);
+ }
+ 
+ static void
Index: pkgsrc/time/sunclock/patches/patch-readvmf.c
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-readvmf.c:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-readvmf.c        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-readvmf.c,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+Fix incorrect type usage (gzFile is already a pointer type).
+Don't use data read from file as a format string.
+
+--- readvmf.c.orig     2008-08-22 13:58:52.000000000 +0000
++++ readvmf.c
+@@ -340,7 +340,7 @@ pixmap_image()
+ char *
+ getdata(fd)
+ #ifdef ZLIB
+-gzFile * fd;
++gzFile fd;
+ #else
+ FILE *fd;
+ #endif
+@@ -433,7 +433,7 @@ struct Sundata * Context;
+   double theta, phi;
+   char *str, *ptr;
+ #ifdef ZLIB
+-  gzFile * fd;
++  gzFile fd;
+   int plen;
+   char *zpath;
+ #else
+@@ -505,7 +505,7 @@ struct Sundata * Context;
+      ret_value = 5;
+      goto abort;
+   }
+-  if (reformat) printf(str);
++  if (reformat) printf("%s", str);
+ 
+   k = 0;
+   num_colors = 0;
Index: pkgsrc/time/sunclock/patches/patch-sunclock.h
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-sunclock.h:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-sunclock.h       Fri Dec  9 14:13:00 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-sunclock.h,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+Fix y2038 bugs; time_t != long.
+
+--- sunclock.h.orig    2006-10-14 14:25:18.000000000 +0000
++++ sunclock.h
+@@ -238,7 +238,7 @@ typedef struct Sundata {
+         unsigned char * nightpixel;     /* pointer to night pixels */
+         Pixel           *vmfpixels;     /* list of additional vmf pixels */
+         int             ncolors;        /* number of colors in day pixels */
+-      long            time;           /* time - real or fake, see flags */
++      time_t          time;           /* time - real or fake, see flags */
+       long            projtime;       /* last time projected illumination */
+       long            roottime;       /* last time written to root */
+       long            animtime;       /* last time of animation */
Index: pkgsrc/time/sunclock/patches/patch-version.h
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-version.h:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-version.h        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-version.h,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+Fix wrong hardcoded version number.
+
+--- version.h.orig     2006-06-22 09:23:28.000000000 +0000
++++ version.h
+@@ -2,6 +2,6 @@
+  * Keep track of version and patch level of sunclock.
+  */
+ 
+-#define       VERSION         "3.56"
+-#define RELEASE         "22 06 2006"
++#define       VERSION         "3.57"
++#define RELEASE         "22 08 2008"
+ #define COPYRIGHT       "� J.-P. Demailly"
Index: pkgsrc/time/sunclock/patches/patch-widgets.c
diff -u /dev/null pkgsrc/time/sunclock/patches/patch-widgets.c:1.1
--- /dev/null   Fri Dec  9 14:13:00 2022
+++ pkgsrc/time/sunclock/patches/patch-widgets.c        Fri Dec  9 14:13:00 2022
@@ -0,0 +1,23 @@
+$NetBSD: patch-widgets.c,v 1.1 2022/12/09 14:13:00 vins Exp $
+
+Fix sprintf() usage.
+
+--- widgets.c.orig     2011-07-09 09:51:18.000000000 +0000
++++ widgets.c
+@@ -818,13 +818,13 @@ char *hint;
+       if (key == '=')
+           sprintf(more+2, "(%c)", (do_sync)? '+' : '-');
+       if (key == '[' && do_root <= 0)
+-          sprintf(more+2, Label[L_ONCE]);
++          sprintf(more+2, "%s", Label[L_ONCE]);
+       if (key == '[' && do_root >= 1)
+           sprintf(more+2, Label[L_PERIODIC], root_period);
+       if (key == ']' && do_root <= 0)
+-          sprintf(more+2, Label[L_BLANKSCREEN]);
++          sprintf(more+2, "%s", Label[L_BLANKSCREEN]);
+       if (key == ']' && do_root >= 1)
+-          sprintf(more+2, Label[L_STARRYSKY]);
++          sprintf(more+2, "%s", Label[L_STARRYSKY]);
+         if (more[2])
+          strncat(hint, more, 120 - strlen(hint));
+         l = strlen(hint);