Update to 0.56, latest stable version. Also add some options to customize

the build.  Closes PR pkg/28646 by pancake@phreaker.net.

Changes:
- Solve ERROR_ vs LOG_ conflicts
- Add cache code into HSML (sepharad)
- Remove silly code in Date Format
- Hsml code fragmented into language modules: c, perl, brainfuck and python
  modules

6 files changed, 60 insertions, 51 deletions

diff --git a/www/screws/Makefile b/www/screws/Makefile
index 829aece9bea..63bb889a3af 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/03/20 17:27:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/20 17:52:20 jmmv Exp $
 #
 
-DISTNAME=	screws-0.54
-PKGREVISION=	3
+DISTNAME=	screws-0.56
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.nopcode.org/prj/screws/
 
@@ -33,6 +32,6 @@ SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	src/Utils/screwsctl
 SUBST_SED.paths=	-e 's|/var/log|${VARBASE}/log|g'
 
-.include "../../lang/lua/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/screws/PLIST b/www/screws/PLIST
index 3429c1b8057..2090cf0de28 100644
--- a/www/screws/PLIST
+++ b/www/screws/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/07/08 23:14:59 erh Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/03/20 17:52:20 jmmv Exp $
 bin/hsml
 lib/screws/BasicExec.so
 lib/screws/CleanLog.so
@@ -7,6 +7,10 @@ lib/screws/HsmlExec.so
 lib/screws/LoadBalancing.so
 lib/screws/Mime.so
 lib/screws/MyReq.so
+lib/screws/lang_brainfuck.so
+lib/screws/lang_c.so
+lib/screws/lang_perl.so
+lib/screws/lang_python.so
 lib/screws/noupdir.so
 lib/screws/unicode.so
 libexec/screws/README
diff --git a/www/screws/distinfo b/www/screws/distinfo
index 4f14923a5b3..e4d907f663a 100644
--- a/www/screws/distinfo
+++ b/www/screws/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2005/03/20 17:27:31 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2005/03/20 17:52:20 jmmv Exp $
 
-SHA1 (screws-0.54.tar.gz) = 87114e17d14f092e943a3a29345a532cfa7e3ca5
-RMD160 (screws-0.54.tar.gz) = 2cc982caae8559656f2249b52d555ecf83531c29
-Size (screws-0.54.tar.gz) = 828711 bytes
-SHA1 (patch-aa) = 12cb94a4756b640179958f19d5a84292dd7eebe2
+SHA1 (screws-0.56.tar.gz) = 3335e7e7116561499ee7164831c31df4ecebe403
+RMD160 (screws-0.56.tar.gz) = 5d7f1af67a42cd5726f0d4708713bb13c4c8fe21
+Size (screws-0.56.tar.gz) = 256862 bytes
+SHA1 (patch-aa) = 0101b7083bb45358371a3853783f9c65cc5b2435
 SHA1 (patch-ab) = a557558437eaa43d36feb4b72dc84c45c4931cfa
 SHA1 (patch-ac) = 7d0542f65b24ba9d7ed035c140d7165a19b2f73d
 SHA1 (patch-ad) = 984fa51aff7d17ba69f3ea1c0b9cf4bbb70e3973
-SHA1 (patch-ae) = 94e0bdce03ee1437188260f6598bd275d3dd381e
+SHA1 (patch-ae) = 962fee7b800118d4b3407d0482cfb73967f011ea
diff --git a/www/screws/options.mk b/www/screws/options.mk
new file mode 100644
index 00000000000..faabe4dd065
--- /dev/null
+++ b/www/screws/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2005/03/20 17:52:20 jmmv Exp $
+#
+
+PKG_DEFAULT_OPTIONS+=	inet6 lua ssl
+PKG_OPTIONS_VAR=	PKG_OPTIONS.screws
+PKG_SUPPORTED_OPTIONS=	inet6 lua ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+MAKE_ENV+=	IPV6=1
+.else
+MAKE_ENV+=	IPV6=0
+.endif
+
+.if !empty(PKG_OPTIONS:Mlua)
+.include "../../lang/lua/buildlink3.mk"
+MAKE_ENV+=	INCORE_LUA=1
+.else
+MAKE_ENV+=	INCORE_LUA=0
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+MAKE_ENV+=	SSL=1
+.else
+MAKE_ENV+=	SSL=0
+.endif
diff --git a/www/screws/patches/patch-aa b/www/screws/patches/patch-aa
index 07b4cdebbbc..0e4ba252668 100644
--- a/www/screws/patches/patch-aa
+++ b/www/screws/patches/patch-aa
@@ -1,45 +1,23 @@
-$NetBSD: patch-aa,v 1.4 2005/03/20 17:27:31 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2005/03/20 17:52:20 jmmv Exp $
 
---- Makefile.orig	2004-05-31 12:56:24.000000000 +0200
+--- Makefile.orig	2004-09-17 01:23:09.000000000 +0200
 +++ Makefile
-@@ -53,11 +53,11 @@ install: all
- 	install -d -m 0755 ${PREFIX}/share/examples/screws
+@@ -55,7 +55,7 @@ install: all
  	install -d -m 0755 ${MODULE_PATH}
  	#install -d -m 0755 ${PREFIX}/libexec/screws/modules
--	install -d -m 0755 ${PREFIX}/man/man8 ${PREFIX}/etc ${PREFIX}/var/log
-+	install -d -m 0755 ${PREFIX}/man/man8 #${PREFIX}/etc ${PREFIX}/var/log
+ 	install -d -m 0755 ${PREFIX}/man/man1 ${PREFIX}/man/man5 \
+-		${PREFIX}/man/man8 ${PREFIX}/etc ${PREFIX}/var/log
++		${PREFIX}/man/man8 #${PREFIX}/etc ${PREFIX}/var/log
  	@echo "==> Installing binaries"
--	install -m 0755 src/Utils/screwsctl ${PREFIX}/sbin/
--	install -m 0755 src/Server/screwsd  ${PREFIX}/sbin/
--	install -m 0755 src/Hsml/hsml       ${PREFIX}/bin/
-+	install -c -m 0755 src/Utils/screwsctl ${PREFIX}/sbin/
-+	install -c -m 0755 src/Server/screwsd  ${PREFIX}/sbin/
-+	install -c -m 0755 src/Hsml/hsml       ${PREFIX}/bin/
- 	@echo "==> Installing standard includes for HSML"
- 	mkdir -p ${DIP}
- 	cp -rf ./src/Hsml/hsml-inc/* ${DIP}/
-@@ -71,17 +71,14 @@ install: all
- 	@echo "==> Examples Documentation and Example files"
- 	@for A in doc/server/* ; do \
- 	echo ... $$A ; \
--	install -m 0644 $$A ${PREFIX}/share/doc/screws/ ; \
-+	install -c -m 0644 $$A ${PREFIX}/share/doc/screws/ ; \
- 	done
--	install -m 0644 doc/images/screws.png ${PREFIX}/share/doc/screws/
--	install -m 0644 doc/manpage/screwsd.8 ${PREFIX}/man/man8/screwsd.8
--	install -m 0644 doc/manpage/screwsctl.1 ${PREFIX}/man/man1/screwsctl.1
--	install -m 0644 doc/manpage/screws.conf.5 ${PREFIX}/man/man5/screws.conf.5
--	install -m 0644 conf/*.conf ${PREFIX}/share/examples/screws/
--	install -m 0644 src/Utils/mime.types ${PREFIX}/share/screws/
+ 	install -c -m 0755 src/Utils/screwsctl ${PREFIX}/sbin/
+ 	install -c -m 0755 src/Server/screwsd  ${PREFIX}/sbin/
+@@ -83,9 +83,6 @@ install: all
+ 	install -c -m 0644 doc/manpage/screws.conf.5 ${PREFIX}/man/man5/screws.conf.5
+ 	install -c -m 0644 conf/*.conf ${PREFIX}/share/examples/screws/
+ 	install -c -m 0644 src/Utils/mime.types ${PREFIX}/share/screws/
 -	if [ ! -e "${CFGFILE}" ] ; then \
--	install -m 0644 conf/default.conf ${CFGFILE} ; \
+-	install -c -m 0644 conf/default.conf ${CFGFILE} ; \
 -	fi
-+	install -c -m 0644 doc/images/screws.png ${PREFIX}/share/doc/screws/
-+	install -c -m 0644 doc/manpage/screwsd.8 ${PREFIX}/man/man8/screwsd.8
-+	install -c -m 0644 doc/manpage/screwsctl.1 ${PREFIX}/man/man1/screwsctl.1
-+	install -c -m 0644 doc/manpage/screws.conf.5 ${PREFIX}/man/man5/screws.conf.5
-+	install -c -m 0644 conf/*.conf ${PREFIX}/share/examples/screws/
-+	install -c -m 0644 src/Utils/mime.types ${PREFIX}/share/screws/
  	@echo ; \
  	echo "***************************************" \
  	     "***************************************"; \
diff --git a/www/screws/patches/patch-ae b/www/screws/patches/patch-ae
index a9566eee2ca..63231d8a33b 100644
--- a/www/screws/patches/patch-ae
+++ b/www/screws/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2005/03/20 17:27:31 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2005/03/20 17:52:20 jmmv Exp $
 
---- src/Hsml/Makefile.orig	2004-05-22 23:16:38.000000000 +0200
+--- src/Hsml/Makefile.orig	2004-11-08 23:41:48.000000000 +0100
 +++ src/Hsml/Makefile
 @@ -7,7 +7,7 @@ DEBUG=-g
  DEFS+=  -DINCORE_LUA=${INCORE_LUA}
  DEFS+=	-DPATH_JAVA=\"${JAVA}\"
- DEFS+=	-DPATH_
+ DEFS+=	-DPATH_CC=\"${PATH_CC}\"
 -CFLAGS= -I/usr/pkg/include -I/usr/local/include ${DEBUG} ${DEFS}
 +CFLAGS+= ${DEBUG} ${DEFS}
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.1 2005/03/20 17:27:31 jmmv Exp $
  	@echo "[hsml] $<"
 @@ -15,7 +15,7 @@ CFLAGS= -I/usr/pkg/include -I/usr/local/
  
- all: opts ${OBJ}
+ all: opts ${OBJ} langs
  	@echo "[hsml] LINKING..."
 -	@${CC} ${CFLAGS} ${OBJ} -o ${BIN} `cat .opts`
 +	@${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} -o ${BIN} `cat .opts`