- set license version

- add working master sites (this port could badly use an update btw) - regen and split patches - regen plist - deadly.org is long gone.
2010-03-20 16:55:33 +00:00 · 2010-03-20 16:55:33 +00:00 · 8d6d68b504
commit 8d6d68b504
parent 03fc5f7544
6 changed files with 37 additions and 38 deletions
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@ -1,23 +1,21 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/15 20:38:26 merdely Exp $
+# $OpenBSD: Makefile,v 1.11 2010/03/20 16:55:33 jasper Exp $

 COMMENT=		WWW OFFLine Explorer

 DISTNAME=		wwwoffle-2.5e
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		www

 HOMEPAGE=		http://www.gedanken.demon.co.uk/wwwoffle/

-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c

-MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/www/servers/} \
-			ftp://ftp.demon.co.uk/pub/unix/httpd/
-
+MASTER_SITES=		http://www.phil.uu.nl/~lievisse/distfiles/
 EXTRACT_SUFX=		.tgz

 FLAVORS=		de fr es ru pl it
--- a/www/wwwoffle/patches/patch-Makefile
+++ b/www/wwwoffle/patches/patch-Makefile
@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $
+$OpenBSD: patch-Makefile,v 1.3 2010/03/20 16:55:33 jasper Exp $

 - use PREFIX instead of hardcoded INSTDIR
 - introduce COMPCONFDIR and COMPSPOOLDIR containing the defines for
@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $


 --- Makefile.orig	Sun Apr  2 17:27:30 2000
-+++ Makefile	Mon Mar 12 14:50:41 2001
+++ Makefile	Wed Feb  3 22:33:16 2010
@@ -16,49 +16,58 @@
 
 LOCALHOST=localhost:8080
@ -19,17 +19,17 @@ $OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $
 -INSTDIR=/usr/local
 -SPOOLDIR=/var/spool/wwwoffle
 -CONFDIR=/var/spool/wwwoffle
-
-# For Cygwin (win32).
-#INSTDIR=/wwwoffle
-#SPOOLDIR=/wwwoffle/spool
-#CONFDIR=/wwwoffle
 +INSTDIR="${PREFIX}"
 +SPOOLDIR="${PREFIX}/share/wwwoffle"
 +COMPSPOOLDIR=/var/spool/wwwoffle
 +CONFDIR="${PREFIX}/share/wwwoffle"
 +COMPCONFDIR=/var/spool/wwwoffle
 
+-# For Cygwin (win32).
+-#INSTDIR=/wwwoffle
+-#SPOOLDIR=/wwwoffle/spool
+-#CONFDIR=/wwwoffle
+-
 # For German language web pages and documentation.
 -#LANG=de
 +.if ${FLAVOR:L:Mde}
@ -90,7 +90,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $
 
 # Optimal flex options for a very fast but large HTML parser.
 LEX=flex -i -L -pp -B -F -8
-@@ -174,7 +183,7 @@ wwwoffled.o  : wwwoffled.c  wwwoffle.h m
+@@ -174,7 +183,7 @@ wwwoffled.o  : wwwoffled.c  wwwoffle.h misc.h config.h
 wwwoffles.o  : wwwoffles.c  wwwoffle.h misc.h config.h errors.h sockets.h proto.h document.h
 
 wwwoffle-tools.o : wwwoffle-tools.c wwwoffle.h misc.h errors.h
@ -99,7 +99,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $
 
 upgrade-cache.o  : upgrade-cache.c  wwwoffle.h misc.h errors.h
 
-@@ -207,7 +216,7 @@ refresh.o    : refresh.c    wwwoffle.h m
+@@ -207,7 +216,7 @@ refresh.o    : refresh.c    wwwoffle.h misc.h config.h
 spool.o      : spool.c      wwwoffle.h misc.h config.h errors.h
 
 config.o     : config.c     wwwoffle.h misc.h config.h errors.h sockets.h proto.h
@ -108,7 +108,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/03/12 13:51:03 wilfried Exp $
 errors.o     : errors.c                       config.h errors.h
 io.o         : io.c         wwwoffle.h misc.h          errors.h
 misc.o       : misc.c                  misc.h config.h                    proto.h
-@@ -217,7 +226,7 @@ sockets.o    : sockets.c                
+@@ -217,7 +226,7 @@ sockets.o    : sockets.c                              
 md5.o        : md5.c md5.h
 
 config-startup.o : config.c     wwwoffle.h misc.h config.h errors.h sockets.h proto.h
--- a/www/wwwoffle/patches/patch-misc_c
+++ b/www/wwwoffle/patches/patch-misc_c
@ -1,22 +1,9 @@
-$OpenBSD: patch-misc,v 1.1.1.1 2000/09/05 11:37:29 espie Exp $
+$OpenBSD: patch-misc_c,v 1.1 2010/03/20 16:55:33 jasper Exp $

 - change arg type for gmtime() and localtime() from long to time_t

-
--- misc.h.orig	Sat Dec 18 17:07:01 1999
-+++ misc.h	Mon Jul 31 19:55:40 2000
-@@ -90,7 +90,7 @@ char *CanonicaliseName(char *name);
- 
- char *MakeHash(const char *args);
- 
-char *RFC822Date(long t,int utc);
-+char *RFC822Date(time_t t,int utc);
- long DateToTimeT(const char *date);
- 
- char *URLDecode(const char *str, int isform);
-
 --- misc.c.orig	Mon Mar 20 20:18:29 2000
-+++ misc.c	Mon Jul 31 19:29:39 2000
+++ misc.c	Wed Feb  3 22:33:16 2010
@@ -681,7 +681,7 @@ char *MakeHash(const char *args)
   int utc Set to true to get Universal Time, else localtime.
   ++++++++++++++++++++++++++++++++++++++*/
--- a/www/wwwoffle/patches/patch-misc_h
+++ b/www/wwwoffle/patches/patch-misc_h
@ -0,0 +1,15 @@
+$OpenBSD: patch-misc_h,v 1.1 2010/03/20 16:55:33 jasper Exp $
+
+- change arg type for gmtime() and localtime() from long to time_t
+
+--- misc.h.orig	Sat Dec 18 17:07:01 1999
+++ misc.h	Wed Feb  3 22:33:16 2010
+@@ -90,7 +90,7 @@ char *CanonicaliseName(char *name);
+ 
+ char *MakeHash(const char *args);
+ 
+-char *RFC822Date(long t,int utc);
+char *RFC822Date(time_t t,int utc);
+ long DateToTimeT(const char *date);
+ 
+ char *URLDecode(const char *str, int isform);
--- a/www/wwwoffle/patches/patch-wwwoffle_conf
+++ b/www/wwwoffle/patches/patch-wwwoffle_conf
@ -1,4 +1,4 @@
-$OpenBSD: patch-wwwoffle_conf,v 1.1.1.1 2000/09/05 11:37:29 espie Exp $
+$OpenBSD: patch-wwwoffle_conf,v 1.2 2010/03/20 16:55:33 jasper Exp $

 - enable running as user "daemon"
 - don't get recursive/cache gzip or compress archives
@ -66,7 +66,7 @@ $OpenBSD: patch-wwwoffle_conf,v 1.1.1.1 2000/09/05 11:37:29 espie Exp $
 # The wwwoffle homepage can be aliased
 # http://wwwoffle/ = http://www.gedanken.demon.co.uk/wwwoffle/
 +  http://openbsd/ = http://www.openbsd.org/
-+  http://deadly/ = http://www.deadly.org/
+  http://undeadly/ = http://www.undeadly.org/
 }
 
 
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.5 2005/02/05 16:54:56 alek Exp $
-bin/wwwoffle
+@comment $OpenBSD: PLIST,v 1.6 2010/03/20 16:55:33 jasper Exp $
+@bin bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
 bin/wwwoffle-read
 bin/wwwoffle-rm
-bin/wwwoffle-tools
+@bin bin/wwwoffle-tools
 bin/wwwoffle-write
@man man/man1/wwwoffle.1
@man man/man5/wwwoffle.conf.5
@man man/man8/wwwoffled.8
-sbin/wwwoffled
+@bin sbin/wwwoffled
 share/doc/wwwoffle/
 share/doc/wwwoffle/CHANGES.CONF
 share/doc/wwwoffle/CONVERT
@ -540,5 +540,4 @@ share/wwwoffle/prevtime1/
 share/wwwoffle/wwwoffle.conf
@owner daemon
@sample /var/spool/wwwoffle/wwwoffle.conf
-@owner
@extraunexec rm -rf /var/spool/wwwoffle