kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update globe to 20140814. Changes adapted from Benedek Gergely.

Browse source 
No changelog available.
This commit is contained in:
youri 2015-10-05 13:47:35 +00:00
parent b15ba42987
commit f071022205
4 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
time/globe/Makefile
View file

@ -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 DISTNAME= globe_14Aug2014
PKGNAME= globe-19940326 PKGNAME= globe-20140814
PKGREVISION= 1
CATEGORIES= time CATEGORIES= time
MASTER_SITES= http://www.acme.com/software/globe/ MASTER_SITES= http://www.acme.com/software/globe/
MAINTAINER= is@NetBSD.org MAINTAINER= is@NetBSD.org
HOMEPAGE= http://www.acme.com/software/globe/ HOMEPAGE= http://www.acme.com/software/globe/
COMMENT= Display the currently-lighted face of Earth in ASCII COMMENT= Display the currently-lighted face of Earth in ASCII
LICENSE= 2-clause-bsd
WRKSRC= ${WRKDIR}/globe WRKSRC= ${WRKDIR}/globe

11
time/globe/distinfo
View file

@ -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 SHA1 (globe_14Aug2014.tar.gz) = d9c2657e0080c762f797dc6d2956d9ce91e220b8
RMD160 (globe_26mar94.tar.gz) = 94470c28771d33c20411ce706aa3695f89a8f336 RMD160 (globe_14Aug2014.tar.gz) = 85f00508aa7625bbe3296ffc4b465c26dd8351a6
Size (globe_26mar94.tar.gz) = 9813 bytes Size (globe_14Aug2014.tar.gz) = 9956 bytes
SHA1 (patch-aa) = cc11ea40f3382506cad6b064a64261ce7081e49c SHA1 (patch-Makefile) = 6b977be1e83edf385b350552bd4e798eea634dca
SHA1 (patch-globe.c) = a5bb9c7655e0eec6e05a5f68875b9216c574b6f9

15
time/globe/patches/patch-aa → time/globe/patches/patch-Makefile
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:39 joerg Exp $ $NetBSD: patch-Makefile,v 1.1 2015/10/05 13:47:35 youri Exp $
pkgsrc-ify the new Makefile
--- Makefile.orig Fri Nov 10 20:11:03 1995 --- Makefile.orig 2014-08-11 19:13:12.000000000 +0000
+++ Makefile +++ Makefile
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
# CONFIGURE: the directory where you want the executables installed. # 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 +MANDIR = ${PREFIX}/man/man1
# CONFIGURE: your favorite C compiler. # CONFIGURE: your favorite C compiler.
-CC = gcc -CC = cc
# CONFIGURE: your favorite C flags. # CONFIGURE: your favorite C flags.
-CFLAGS = -O 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
+CFLAGS = -O2
# CONFIGURE: your favorite linker flags. # CONFIGURE: your favorite linker flags.
-LDFLAGS = -s -LDFLAGS = -s
all: globe all: globe
@@ -19,10 +17,8 @@ @@ -19,10 +17,7 @@ globe: globe.c
$(CC) $(CFLAGS) globe.c $(LDFLAGS) -o globe $(CC) $(CFLAGS) globe.c $(LDFLAGS) -o globe
install: all install: all
@ -31,8 +30,8 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:39 joerg Exp $
- cp globe $(BINDIR) - cp globe $(BINDIR)
- rm -f $(MANDIR)/man1/globe.1 - rm -f $(MANDIR)/man1/globe.1
- cp globe.1 $(MANDIR)/man1 - cp globe.1 $(MANDIR)/man1
-
+ ${BSD_INSTALL_PROGRAM} globe ${DESTDIR}$(BINDIR) + ${BSD_INSTALL_PROGRAM} globe ${DESTDIR}$(BINDIR)
+ ${BSD_INSTALL_MAN} globe.1 ${DESTDIR}$(MANDIR) + ${BSD_INSTALL_MAN} globe.1 ${DESTDIR}$(MANDIR)
clean: clean:
rm -f globe a.out core rm -f globe a.out core

15
time/globe/patches/patch-globe.c
View file

@ -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;