Update globe to 20140814. Changes adapted from Benedek Gergely.

No changelog available.

4 files changed, 16 insertions, 33 deletions

diff --git a/time/globe/Makefile b/time/globe/Makefile
index bf2c714fa48..65e8de3c0c3 100644
--- a/time/globe/Makefile
+++ b/time/globe/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 13:04:18 asau Exp $
+# $NetBSD: Makefile,v 1.9 2015/10/05 13:47:35 youri Exp $
 #
 
-DISTNAME=	globe_26mar94
-PKGNAME=	globe-19940326
-PKGREVISION=	1
+DISTNAME=	globe_14Aug2014
+PKGNAME=	globe-20140814
 CATEGORIES=	time
 MASTER_SITES=	http://www.acme.com/software/globe/
 
 MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.acme.com/software/globe/
 COMMENT=	Display the currently-lighted face of Earth in ASCII
+LICENSE=	2-clause-bsd
 
 WRKSRC=		${WRKDIR}/globe
 
diff --git a/time/globe/distinfo b/time/globe/distinfo
index 28ab02b72d8..115cb397b6c 100644
--- a/time/globe/distinfo
+++ b/time/globe/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/04/17 17:49:28 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/10/05 13:47:35 youri Exp $
 
-SHA1 (globe_26mar94.tar.gz) = e1d27953237d3ae1648080045f86a0529cd01b7f
-RMD160 (globe_26mar94.tar.gz) = 94470c28771d33c20411ce706aa3695f89a8f336
-Size (globe_26mar94.tar.gz) = 9813 bytes
-SHA1 (patch-aa) = cc11ea40f3382506cad6b064a64261ce7081e49c
-SHA1 (patch-globe.c) = a5bb9c7655e0eec6e05a5f68875b9216c574b6f9
+SHA1 (globe_14Aug2014.tar.gz) = d9c2657e0080c762f797dc6d2956d9ce91e220b8
+RMD160 (globe_14Aug2014.tar.gz) = 85f00508aa7625bbe3296ffc4b465c26dd8351a6
+Size (globe_14Aug2014.tar.gz) = 9956 bytes
+SHA1 (patch-Makefile) = 6b977be1e83edf385b350552bd4e798eea634dca
diff --git a/time/globe/patches/patch-aa b/time/globe/patches/patch-Makefile
index 536997d61c3..18b35fb7d1a 100644
--- a/time/globe/patches/patch-aa
+++ b/time/globe/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:39 joerg Exp $
-
---- Makefile.orig	Fri Nov 10 20:11:03 1995
+$NetBSD: patch-Makefile,v 1.1 2015/10/05 13:47:35 youri Exp $
+	pkgsrc-ify the new Makefile 
+--- Makefile.orig	2014-08-11 19:13:12.000000000 +0000
 +++ Makefile
 @@ -1,17 +1,15 @@
  # CONFIGURE: the directory where you want the executables installed.
@@ -12,18 +12,17 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:39 joerg Exp $
 +MANDIR =	${PREFIX}/man/man1
  
  # CONFIGURE: your favorite C compiler.
--CC =		gcc
+-CC =		cc
  
  # CONFIGURE: your favorite C flags.
--CFLAGS =	-O
-+CFLAGS =	-O2
+ CFLAGS =	-O -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
  
  # CONFIGURE: your favorite linker flags.
 -LDFLAGS =	-s
  
  all:		globe
  
-@@ -19,10 +17,8 @@
+@@ -19,10 +17,7 @@ globe:		globe.c
  	$(CC) $(CFLAGS) globe.c $(LDFLAGS) -o globe
  
  install:	all
@@ -31,8 +30,8 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:39 joerg Exp $
 -	cp globe $(BINDIR)
 -	rm -f $(MANDIR)/man1/globe.1
 -	cp globe.1 $(MANDIR)/man1
+-
 +	${BSD_INSTALL_PROGRAM} globe ${DESTDIR}$(BINDIR)
 +	${BSD_INSTALL_MAN} globe.1 ${DESTDIR}$(MANDIR)
- 
  clean:
  	rm -f globe a.out core
diff --git a/time/globe/patches/patch-globe.c b/time/globe/patches/patch-globe.c
deleted file mode 100644
index fdf342e0fe3..00000000000
--- a/time/globe/patches/patch-globe.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-globe.c,v 1.1 2012/04/17 17:49:29 joerg Exp $
-
---- globe.c.orig	2012-04-17 16:08:21.000000000 +0000
-+++ globe.c
-@@ -731,8 +731,8 @@ static char* globes[NGLOBES][NLINES] =
-     };
- 
- 
--void
--main( int argc, char* argv )
-+int
-+main(void)
-     {
-     time_t now;
-     int gnum, lnum;