- Update to 3.57

PR:		171956
Submitted by:	Ports Fury

4 files changed, 9 insertions, 119 deletions

diff --git a/astro/sunclock/files/patch-Imakefile b/astro/sunclock/files/patch-Imakefile
deleted file mode 100644
index ae6287c2a336..000000000000
--- a/astro/sunclock/files/patch-Imakefile
+++ /dev/null
@@ -1,74 +0,0 @@
---- Imakefile.orig	Sun Jun 18 23:58:50 2006
-+++ Imakefile	Fri Aug  4 19:11:06 2006
-@@ -1,18 +1,18 @@
- XCOMM Should install to /usr or /usr/local ??
--DESTDIR=/usr
-+DESTDIR=${PREFIX}
- 
- XCOMM Name of man subdirectory of DESTDIR:
--MANDIR=/X11R6/man/man1
-+MANDIR=/man/man1
- 
- XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
--BINDIR=/X11R6/bin
-+BINDIR=/bin
- 
- XCOMM Name of share subdirectory of DESTDIR:
- SHAREDIR=/share/sunclock
- 
- XCOMM Name of DOCDIR's subdirectories of DESTDIR:
- DOCDIR=/X11R6/lib/X11/doc 
--DOCHTMLDIR=/X11R6/lib/X11/doc/html
-+DOCHTMLDIR=/lib/X11/doc/html
- 
- XCOMM
- XCOMM Compile options:
-@@ -42,13 +42,12 @@
- #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)\"
-+XPMLIBDIR=-L${LOCALBASE}/lib
-+XPMINC=-I${LOCALBASE}/include/X11
-+JLIBDIR=-L${LOCALBASE}/lib
-+ZLIBDIR=-L${LOCALBASE}/lib
-+JINC=-I${LOCALBASE}/include
-+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -L${LOCALBASE}/lib
- #endif
- 
- SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
-@@ -64,7 +63,7 @@
- all::
- 	cd editkit ; xmkmf ; make emx \
-           DESTDIR=$(DESTDIR) \
--	  BINDIR=$(SHAREDIR)/bin \
-+	  BINDIR=/bin \
- 	  MANDIR=$(SHAREDIR)/editkit \
- 	  SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
- 
-@@ -74,14 +73,13 @@
- 
- install:: install.man
- 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n
--	cp -f Sunclockrc $(DESTDIR)$(SHAREDIR)
--	cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
-+	${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR)
-+	cd i18n ; rm -f *~ ; ${BSD_INSTALL_DATA} Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
- 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
--	cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
--	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
--	install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
-+	cd vmf ; rm -f *~ ; ${BSD_INSTALL_DATA} * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
-+	${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin
- 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
--	cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
-+	cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
- 		$(DESTDIR)$(SHAREDIR)/editkit
- 	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
- 	cat MESSAGE
diff --git a/astro/sunclock/files/patch-editkit_Imakefile b/astro/sunclock/files/patch-editkit_Imakefile
deleted file mode 100644
index a73976658268..000000000000
--- a/astro/sunclock/files/patch-editkit_Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- editkit/Imakefile.orig	Sat Mar 11 00:11:23 2006
-+++ editkit/Imakefile	Fri Aug  4 19:13:21 2006
-@@ -33,7 +33,9 @@
- XCOMM Compile options:
- XCOMM
- 
--CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
-+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -L${LOCALBASE}/lib
-+
-+CCOPTIONS=${COPTS}
- 
- LOCAL_LIBRARIES=$(XLIB)
- DEPLIBS=		# I don't know what I'm doing, and I hate imake!
-@@ -45,7 +47,7 @@
- 
- x11.o:
- 	ln -sf MANUAL.emacs emx.man
--	$(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
-+	$(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c
- 
- install.man::
- 	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
-@@ -55,9 +57,9 @@
- 
- install::
- 	mkdir -p $(SHAREDIR)
--	cp -f rc.example $(SHAREDIR)/rc.common
--	cd $(SHAREDIR); ln -sf rc.common emxrc
--	cp -f README $(SHAREDIR)
-+	${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common
-+	${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc
-+	${BSD_INSTALL_DATA} README $(SHAREDIR)
- 
- clean::
- 	rm -f core *~ emx.man
diff --git a/astro/sunclock/files/patch-sunclock.c b/astro/sunclock/files/patch-sunclock.c
index 79ef078a2c40..c3e9135f0983 100644
--- a/astro/sunclock/files/patch-sunclock.c
+++ b/astro/sunclock/files/patch-sunclock.c
@@ -59,16 +59,6 @@
          Context->projtime = -1L;
          Context->roottime = -1L;
          Context->animtime = -1L;
-@@ -3142,8 +3131,8 @@
- {
-    int ilon, ilat, width, dw = 0;
-    struct TextLabel * label;
--   if(!Context->wintype) return;
-    char *text, *text0, *ptr;
-+   if(!Context->wintype) return;
- 
-    label = Context->label;
-    while (label) if (label->text && *label->text) {
 @@ -3918,7 +3907,7 @@
  
          if (button_pressed) return;
diff --git a/astro/sunclock/files/patch-widgets.c b/astro/sunclock/files/patch-widgets.c
new file mode 100644
index 000000000000..e15c78a91f13
--- /dev/null
+++ b/astro/sunclock/files/patch-widgets.c
@@ -0,0 +1,9 @@
+--- widgets.c.orig	2011-07-09 18:51:18.000000000 +0900
++++ widgets.c	2012-08-14 04:13:36.000000000 +0900
+@@ -1,6 +1,5 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+-#include <sys/timeb.h>
+ #include <sys/stat.h>
+ #include <string.h>
+