cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleaning where needed:

Browse Source 
- WANTLIB
- MASTER_SITES
- regen patches
This commit is contained in:
ajacoutot 2007-12-18 09:43:36 +00:00
parent 542c88010e
commit 0d7bf2810f
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
astro/luna/patches/patch-luna_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
--- luna.c.orig Fri Nov 9 11:53:53 2001
+++ luna.c Fri Nov 9 11:55:05 2001
$OpenBSD: patch-luna_c,v 1.2 2007/12/18 09:43:36 ajacoutot Exp $
--- luna.c.orig Tue Dec 18 09:36:17 2007
+++ luna.c Tue Dec 18 09:36:17 2007
@@ -25,27 +25,41 @@
#include "luna.h"
@ -17,7 +17,8 @@ $OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
+ int aotmoon, tzhere, i;
+ struct tm *localtmp, algotm;
+ char *chp, *envp, *tzname;
+
- getoptions(argc, argv, &localtmp, &algotmp);
+ getoptions(argc, argv, &localtmp);
+ envp = getenv("TZ");
+ if ((envp = getenv("TZ")) == NULL ||
@ -28,8 +29,7 @@ $OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
+ tzhere = atoi(chp);
+ }
+ tzconv(&algotm, localtmp, tzhere - TZ_ALGO);
- getoptions(argc, argv, &localtmp, &algotmp);
+
for (i = 0; i < bdate; i++) {
if (extluna) {
aotmoon = getext(localtmp -> tm_year, localtmp -> tm_mon,
@ -37,11 +37,11 @@ $OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
} else {
- aotmoon = getmoon(algotmp -> tm_year, algotmp -> tm_yday);
+ aotmoon = getmoon(algotm.tm_year, algotm.tm_yday);
+ }
}
+
+ if ((tzname = getenv("TZ")) == NULL) {
+ tzname = TZNAME_DFL;
}
+ }
- chp = Asctime(localtmp);
+ chp = asctime(localtmp);
@ -83,7 +83,7 @@ $OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
struct tm *localtmp;
argnumcnt = 0;
@@ -203,7 +215,7 @@ getoptions(argc, argv, localtmpp, algotm
@@ -203,7 +215,7 @@ getoptions(argc, argv, localtmpp, algotmpp)
strlwr(argv[i]);
#else
for (j = 0; j < strlen(argv[i]); j++) {
@ -92,7 +92,7 @@ $OpenBSD: patch-luna_c,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
}
#endif /* MSDOS or not */
@@ -376,19 +388,7 @@ getoptions(argc, argv, localtmpp, algotm
@@ -376,19 +388,7 @@ getoptions(argc, argv, localtmpp, algotmpp)
= ymd2yday(localtmp -> tm_year, localtmp -> tm_mon,
localtmp -> tm_mday);

8
astro/luna/patches/patch-luna_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-luna_h,v 1.2 2002/08/02 01:43:47 wcobb Exp $
--- luna.h.orig Thu Aug 1 20:35:34 2002
+++ luna.h Thu Aug 1 20:42:19 2002
$OpenBSD: patch-luna_h,v 1.3 2007/12/18 09:43:36 ajacoutot Exp $
--- luna.h.orig Tue Dec 18 09:36:17 2007
+++ luna.h Tue Dec 18 09:36:17 2007
@@ -11,6 +11,7 @@
@ -23,11 +23,11 @@ $OpenBSD: patch-luna_h,v 1.2 2002/08/02 01:43:47 wcobb Exp $
-#define printf iprintf
-#define sprintf isprintf
-#define fprintf ifprintf
-
+extern int getext(int, int, int);
+extern int getmoon(int, int);
+extern int ymd2yday(int, int, int);
-
#if defined(ANSI)
- extern void main(int argc, char **argv);
+ extern int main(int argc, char **argv);

8
astro/luna/patches/patch-makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-makefile,v 1.2 2002/08/02 01:43:47 wcobb Exp $
--- makefile.orig Thu Aug 1 20:35:34 2002
+++ makefile Thu Aug 1 20:42:45 2002
$OpenBSD: patch-makefile,v 1.3 2007/12/18 09:43:36 ajacoutot Exp $
--- makefile.orig Tue Dec 18 09:36:17 2007
+++ makefile Tue Dec 18 09:36:17 2007
@@ -2,23 +2,14 @@
# Makefile for luna using BSD cc
#
@ -39,7 +39,7 @@ $OpenBSD: patch-makefile,v 1.2 2002/08/02 01:43:47 wcobb Exp $
HDRS = luna.h
HDRSPR = pyramid.h
HDRSIP = iprintf/iansilib.h iprintf/iprint.h
@@ -35,13 +26,15 @@ HDRSIP = iprintf/iansilib.h iprintf/ipri
@@ -35,13 +26,15 @@ HDRSIP = iprintf/iansilib.h iprintf/iprint.h
#
all : $(PROG)

8
astro/phoon/patches/patch-astro_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-astro_h,v 1.1 2006/07/02 11:05:42 steven Exp $
--- astro.h.orig Sat Jul 1 16:00:46 2006
+++ astro.h Sat Jul 1 16:00:56 2006
@@ -43,4 +43,4 @@ extern void phasehunt2( double sdate, do
$OpenBSD: patch-astro_h,v 1.2 2007/12/18 09:43:37 ajacoutot Exp $
--- astro.h.orig Tue Jan 28 01:55:32 2003
+++ astro.h Tue Dec 18 09:38:15 2007
@@ -43,4 +43,4 @@ extern void phasehunt2( double sdate, double phases[2]
*/
extern double phase( double pdate, double* pphase, double* mage, double* dist, double* angdia, double* sudist, double* suangdia );

6
astro/phoon/patches/patch-phoon_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-phoon_c,v 1.3 2006/07/02 11:05:42 steven Exp $
$OpenBSD: patch-phoon_c,v 1.4 2007/12/18 09:43:37 ajacoutot Exp $
--- phoon.c.orig Fri May 20 21:10:24 2005
+++ phoon.c Sun Jul 2 11:50:52 2006
@@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* a
+++ phoon.c Tue Dec 18 09:38:15 2007
@@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* atfiller )
struct tm* tmP;
double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang;
double phases[2], which[2];

6
astro/sunclock/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.11 2007/09/15 10:37:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2007/12/18 09:43:37 ajacoutot Exp $
COMMENT-main= display the phase of the Sun on a map of the Earth
COMMENT-maps= additional maps of the Earth for sunclock
VERSION= 3.56
DISTNAME= sunclock-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-maps= sunclock-maps-${VERSION}
CATEGORIES= astro
@ -43,7 +43,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main= X11 Xext Xpm c m z
WANTLIB-main= X11 Xext Xpm Xau Xdmcp c m z
DIST_SUBDIR= sunclock

10
astro/sunclock/patches/patch-Imakefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Imakefile,v 1.3 2007/04/01 16:04:06 naddy Exp $
$OpenBSD: patch-Imakefile,v 1.4 2007/12/18 09:43:37 ajacoutot Exp $
--- Imakefile.orig Sun Jun 18 21:58:50 2006
+++ Imakefile Fri Mar 23 21:40:39 2007
+++ Imakefile Tue Dec 18 10:10:55 2007
@@ -1,5 +1,5 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@ -8,7 +8,7 @@ $OpenBSD: patch-Imakefile,v 1.3 2007/04/01 16:04:06 naddy Exp $
XCOMM Name of man subdirectory of DESTDIR:
MANDIR=/X11R6/man/man1
@@ -8,7 +8,7 @@ XCOMM Name of bin subdirectory of DESTDI
@@ -8,7 +8,7 @@ XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin
BINDIR=/X11R6/bin
XCOMM Name of share subdirectory of DESTDIR:
@ -17,7 +17,7 @@ $OpenBSD: patch-Imakefile,v 1.3 2007/04/01 16:04:06 naddy Exp $
XCOMM Name of DOCDIR's subdirectories of DESTDIR:
DOCDIR=/X11R6/lib/X11/doc
@@ -42,13 +42,14 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB
@@ -42,13 +42,14 @@ CCOPTIONS = -Ae $(XPMINC) $(JINC) -DZLIB -DSHAREDIR=\"
#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
# Solaris, Linux
@ -38,7 +38,7 @@ $OpenBSD: patch-Imakefile,v 1.3 2007/04/01 16:04:06 naddy Exp $
#endif
SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
@@ -60,13 +61,6 @@ LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lX
@@ -60,13 +61,6 @@ LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR)
DEPLIBS= # I don't know what I'm doing, and I hate imake!
ComplexProgramTarget(sunclock)

6
astro/xworld/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2007/09/15 10:37:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2007/12/18 09:43:37 ajacoutot Exp $
COMMENT= earth as seen from the direction of the sun
@ -7,14 +7,14 @@ CATEGORIES= astro x11
MAINTAINER= Vladimir Kotal <vlada@openbsd.cz>
MASTER_SITES= ftp://gutemine.geo.uni-koeln.de/pub/xworld/ \
ftp://ftp.Uni-Koeln.DE/misc/
MASTER_SITES= ftp://ftp.Uni-Koeln.DE/misc/
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 c m
USE_X11= Yes