diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
| commit | 8515688e4fc1e61508e192542688b3ff53ea4ca8 (patch) | |
| tree | d2d4ad86fb660f5fc1d74e8ef4b3232c9aad1046 /www | |
| parent | 3612c287b035cd52b87361b84833d892629cf955 (diff) | |
| download | pkgsrc-8515688e4fc1e61508e192542688b3ff53ea4ca8.tar.gz | |
Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2
packages that have been converted to USE_BUILDLINK2.
Diffstat (limited to 'www')
60 files changed, 449 insertions, 264 deletions
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 997e3928384..1ce57ef2a21 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34.2.2 2002/06/21 23:05:46 jlam Exp $ +# $NetBSD: Makefile,v 1.34.2.3 2002/08/25 21:21:58 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -9,7 +9,7 @@ WRKSRC= ${WRKDIR}/Mosaic-src CATEGORIES= www MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/ -MAINTAINER= tv@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/ COMMENT= World Wide Web browser diff --git a/www/Mosaic/PLIST b/www/Mosaic/PLIST index c25a3a401ca..e78b634a9b2 100644 --- a/www/Mosaic/PLIST +++ b/www/Mosaic/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:02 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:59 jlam Exp $ bin/Mosaic bin/mosaic lib/X11/app-defaults/Mosaic -@exec ${MKDIR} -p %D/share/mosaic +@exec ${MKDIR} %D/share/mosaic @unexec ${RM} -rf %D/share/mosaic diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 0f55ac1b673..45b17a9855e 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.4.2.1 2002/06/30 06:24:31 jlam Exp $ +$NetBSD: distinfo,v 1.4.2.2 2002/08/25 21:22:00 jlam Exp $ SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b Size (amaya-src-5.1.tgz) = 4925073 bytes -SHA1 (patch-aa) = aa7212f3424ac2593a9f38a6e2436ff781ba6fd0 +SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838 SHA1 (patch-ad) = de880e28c117fdb64fc48e2b2d03be16c634bd8b +SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39 +SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index 0809985fb38..3dd273780bc 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,7 +1,15 @@ -$NetBSD: patch-aa,v 1.7 2001/08/09 19:03:19 jlam Exp $ - ---- ../configure.orig Tue Jul 3 07:23:50 2001 -+++ ../configure +$NetBSD: patch-aa,v 1.7.2.1 2002/08/25 21:22:01 jlam Exp $ +--- ../configure.orig Tue Jul 3 13:23:50 2001 ++++ ../configure Mon Jul 1 02:48:37 2002 +@@ -3049,7 +3049,7 @@ + fi + + +-for ac_hdr in stdio.h ++for ac_hdr in stdio.h wchar.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -6425,12 +6425,6 @@ diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae new file mode 100644 index 00000000000..a393c4e95ef --- /dev/null +++ b/www/amaya/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.5.4.2 2002/08/25 21:22:02 jlam Exp $ +--- ../thotlib/include/ustring.h.orig Mon Jul 1 02:49:43 2002 ++++ ../thotlib/include/ustring.h Mon Jul 1 02:55:09 2002 +@@ -5,7 +5,11 @@ + #ifdef _WINDOWS + #include <windows.h> + #endif /* _WINDOWS */ ++ ++#include "config.h" ++#ifdef HAVE_WCHAR_H + #include <wchar.h> ++#endif /* HAVE_WCHAR_H */ + + #ifdef _WINDOWS + #define strncasecmp _strnicmp diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af new file mode 100644 index 00000000000..1decba3d8b3 --- /dev/null +++ b/www/amaya/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.4.4.2 2002/08/25 21:22:03 jlam Exp $ +--- ../config.h.in.orig Mon Jul 1 02:52:16 2002 ++++ ../config.h.in Mon Jul 1 02:52:51 2002 +@@ -321,6 +321,9 @@ + /* Define if you have the <unixlib.h> header file. */ + #undef HAVE_UNIXLIB_H + ++/* Define if you have the <wchar.h> header file. */ ++#undef HAVE_WCHAR_H ++ + /* Define if you have the dl library (-ldl). */ + #undef HAVE_LIBDL + diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index c41ce4c82ba..883b75fee90 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.2.1 2002/07/01 17:45:12 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2002/08/25 21:22:04 jlam Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -9,7 +9,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.webdav.org/mod_dav/ COMMENT= Apache WebDAV module -# Ugly mess that says apache>=1.3.9 and apache<=2.0. +# Ugly mess that says apache>=1.3.9 and apache<2.0. BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} USE_BUILDLINK2= YES diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 41ea807615d..def3e6b016f 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.19.2.1 2002/06/30 15:31:15 jlam Exp $ +# $NetBSD: Makefile,v 1.19.2.2 2002/08/25 21:22:05 jlam Exp $ # -DISTNAME= mod_perl-1.25 -PKGNAME= ap-perl-1.25 -PKGREVISION= 1 -CATEGORIES= www perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ - http://perl.apache.org/dist/ +DISTNAME= mod_perl-1.25 +PKGNAME= ap-perl-1.25 +PKGREVISION= 1 +CATEGORIES= www perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ + http://perl.apache.org/dist/ -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://perl.apache.org/ -COMMENT= Module that embeds a Perl interpreter into Apache +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://perl.apache.org/ +COMMENT= Module that embeds a Perl interpreter into Apache -DEPENDS+= {perl>=5.8.0rc2,libperl>=${LIBPERL5_REQD}}:../../lang/libperl -DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource +DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache +DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl +DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource USE_BUILDLINK2= YES APACHE_MODULE= YES diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index ec83de3b72b..6254f917e93 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.47.2.2 2002/07/01 17:45:13 jlam Exp $ +# $NetBSD: Makefile,v 1.47.2.3 2002/08/25 21:22:05 jlam Exp $ -DISTNAME= mod_ssl-2.8.9-1.3.26 -PKGNAME= ap-ssl-2.8.9 +DISTNAME= mod_ssl-2.8.10-1.3.26 +PKGNAME= ap-ssl-2.8.10 +PKGREVISION= 1 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ @@ -13,7 +14,7 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -BUILDLINK_DEPENDS.apache= apache-1.3.26nb1 +BUILDLINK_DEPENDS.apache= apache-1.3.26nb4 USE_BUILDLINK2= YES APACHE_MODULE= YES diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index 984bac306b1..ce484007e0b 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:25 jlam Exp $ +$NetBSD: distinfo,v 1.10.2.2 2002/08/25 21:22:07 jlam Exp $ -SHA1 (mod_ssl-2.8.9-1.3.26.tar.gz) = 3075124cce758f06b292baa754d55eab639cdfc9 -Size (mod_ssl-2.8.9-1.3.26.tar.gz) = 752613 bytes +SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e +Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = bd1d4eeff91f87a2b46f1ce0ad95dab8a3c23c84 diff --git a/www/apache2/Makefile b/www/apache2/Makefile index e3b52d282d8..4ffec1e553c 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.6.2.3 2002/06/23 19:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.4 2002/08/25 21:22:07 jlam Exp $ -DISTNAME= httpd-2.0.39 -PKGNAME= apache-2.0.39 +DISTNAME= httpd-${APACHE_VERSION} +PKGNAME= apache-${APACHE_VERSION} +APACHE_VERSION= 2.0.39 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://httpd.apache.org/dist/httpd/old/ \ @@ -10,9 +12,9 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://httpd.apache.org/ -COMMENT= HTTP (Web) server, version 2 +COMMENT= Apache HTTP (Web) server, version 2 -CONFLICTS= apache-*modssl-[0-9]* apache-[0-9]* apache6-[0-9]* +CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs BUILD_DEFS+= USE_INET6 @@ -46,10 +48,11 @@ CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}" CONFIGURE_ARGS+= --enable-so BUILD_DEFS+= APACHE_MODULES +APACHE_USER?= www +APACHE_GROUP?= www + SUEXEC_COMMENT?= "@comment " .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -APACHE_SUEXEC_USER?= www -APACHE_SUEXEC_GROUP?= nogroup APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/apache/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin APACHE_SUEXEC_CONFIGURE_ARGS+= \ @@ -62,10 +65,11 @@ CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC APACHE_SUEXEC_CONFIGURE_ARGS SUEXEC_COMMENT= # empty -PKG_GROUPS= ${APACHE_SUEXEC_GROUP} -PKG_USERS= ${APACHE_SUEXEC_USER}:${APACHE_SUEXEC_GROUP}::Apache\\ suEXEC\\ user .endif +PKG_GROUPS= ${APACHE_GROUP} +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user + PLIST_SUBST+= SUEXEC_COMMENT=${SUEXEC_COMMENT} PKG_SYSCONFVAR= apache @@ -83,11 +87,7 @@ MAKE_DIRS= ${PREFIX}/share/httpd MAKE_DIRS+= ${PREFIX}/share/httpd/htdocs OWN_DIRS= /var/log/httpd OWN_DIRS+= /var/db/httpd -.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_SUEXEC_USER} ${APACHE_SUEXEC_GROUP} 0755 -.else -OWN_DIRS_PERMS+= /var/db/httpd/proxy nobody nobody 0755 -.endif +OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # Add dependencies for the modules that will be built. For each module # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace @@ -124,10 +124,8 @@ AP_CONF_FILE_SED+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" AP_CONF_FILE_SED+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" AP_CONF_FILE_SED+= -e "s|logs/|/var/log/httpd/|g" AP_CONF_FILE_SED+= -e "s|/var/log/httpd/foo\.log|logs/foo.log/|g" -.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_SUEXEC_USER}|g" -AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_SUEXEC_GROUP}|g" -.endif +AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g" +AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g" post-install: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index 22b785949d8..a6b818f8103 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.3 2002/04/13 21:35:51 jlam Exp $ +# $NetBSD: apache.sh,v 1.3.2.1 2002/08/25 21:22:08 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -19,13 +19,16 @@ rcvar=$name command="@PREFIX@/sbin/httpd" ctl_command="@PREFIX@/sbin/apachectl" required_files="@PKG_SYSCONFDIR@/httpd.conf" +extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" restart_cmd="apache_doit restart" +reload_cmd="apache_doit reload" # "${apache_start}" is the subcommand sent to apachectl to control how # httpd is started. It's value may be overridden in: # +# @PKG_SYSCONFDIR@/apache_start.conf # /etc/rc.conf # /etc/rc.conf.d/apache, # @@ -33,17 +36,22 @@ restart_cmd="apache_doit restart" # and "startssl", and defaults to "start". # apache_start=start +if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] +then + . @PKG_SYSCONFDIR@/apache_start.conf +fi apache_doit () { case $1 in start) action=${apache_start} ;; + reload) action=graceful ;; *) action=$1 ;; esac ${ctl_command} ${action} } -if [ -f /etc/rc.subr ] +if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ] then load_rc_config $name run_rc_command "$1" diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 63d44da861e..3ed39cdbb94 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49.2.2 2002/06/30 06:24:31 jlam Exp $ +# $NetBSD: Makefile,v 1.49.2.3 2002/08/25 21:22:09 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -7,8 +7,10 @@ # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs) # -DISTNAME= apache_1.3.26 -PKGNAME= apache6-1.3.26 +DISTNAME= apache_${APACHE_VERSION} +PKGNAME= apache6-${APACHE_VERSION} +APACHE_VERSION= 1.3.26 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -23,9 +25,9 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= itojun@netbsd.org HOMEPAGE= http://httpd.apache.org/ -COMMENT= HTTP (Web) server with IPv6 support +COMMENT= Apache HTTP (Web) server with IPv6 support -CONFLICTS= apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]* +CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} USE_BUILDLINK2= YES @@ -38,6 +40,7 @@ CONFIGURE_ARGS+= --enable-module=most \ --enable-rule=INET6 # proxy module is broken with the IPv6 patch CONFIGURE_ARGS+= --disable-module=proxy +CONFIGURE_ARGS+= --without-confadjust CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" @@ -50,20 +53,30 @@ BUILD_DEFS+= USE_INET6 IGNORE= "IPv6 only build" .endif +.if empty(STRIPFLAG) +CONFIGURE_ARGS+= --without-execstrip +.endif + PKG_SYSCONFSUBDIR?= httpd +APACHE_USER?= www +APACHE_GROUP?= www +BUILD_DEFS+= APACHE_USER +BUILD_DEFS+= APACHE_GROUP + +CONFIGURE_ARGS+= --server-uid=${APACHE_USER} +CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} + .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -APACHE_SUEXEC_USER?= www APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin APACHE_SUEXEC_CONFIGURE_ARGS+= \ - --suexec-caller=${APACHE_SUEXEC_USER} \ + --suexec-caller=${APACHE_USER} \ --suexec-safepath='${APACHE_SUEXEC_PATH}' \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} CONFIGURE_ARGS+= --enable-suexec \ ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*} PLIST_SRC= ${PKGDIR}/PLIST.suexec -PKG_USERS= ${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS .endif @@ -73,6 +86,12 @@ BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS PLIST_SRC+= ${PKGDIR}/PLIST +.if defined(NOPIC) +PLIST_SUBST+= SHLIBS="@comment " +.else +PLIST_SUBST+= SHLIBS="" +.endif + APACHE_CUSTOM_CFLAGS?= # empty .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES @@ -101,6 +120,9 @@ BUILD_DEFS+= APACHE_CUSTOM_CFLAGS BUILD_DEFS+= APACHE_PERF_TUNING BUILD_DEFS+= APACHE_SUEXEC +PKG_GROUPS= ${APACHE_GROUP} +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user + EGDIR= ${PREFIX}/share/examples/httpd CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf @@ -108,8 +130,9 @@ SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types RCD_SCRIPTS= apache -OWN_DIRS= /var/log/httpd -OWN_DIRS+= /var/spool/httpd +OWN_DIRS+= ${PREFIX}/lib/httpd +OWN_DIRS+= /var/httpd +OWN_DIRS+= /var/log/httpd pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f diff --git a/www/apache6/PLIST b/www/apache6/PLIST index 3728c2dd14f..25b87f17f93 100644 --- a/www/apache6/PLIST +++ b/www/apache6/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 19:03:35 jlam Exp $ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/08/25 21:22:11 jlam Exp $ +bin/checkgid bin/dbmmanage bin/htdigest bin/htpasswd @@ -50,6 +51,7 @@ include/httpd/xml/xmlparse.h include/httpd/xml/xmlrole.h include/httpd/xml/xmltok.h include/httpd/xml/xmltok_impl.h +${SHLIBS}lib/httpd/httpd.exp libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi man/man1/dbmmanage.1 @@ -604,7 +606,9 @@ share/httpd/icons/world2.png @dirrm share/httpd/htdocs/manual/images @dirrm share/httpd/htdocs/manual/howto @dirrm share/httpd/htdocs/manual +@unexec ${RMDIR} %D/share/httpd/htdocs 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/httpd 2>/dev/null || ${TRUE} @dirrm share/examples/httpd +@unexec ${RMDIR} %D/lib/httpd 2>/dev/null || ${TRUE} @dirrm include/httpd/xml @dirrm include/httpd - diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index 5777b3a8bf4..b8311698952 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.13 2002/02/26 20:28:41 jlam Exp $ +# $NetBSD: apache.sh,v 1.13.2.1 2002/08/25 21:22:12 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -19,9 +19,11 @@ rcvar=$name command="@PREFIX@/sbin/httpd" ctl_command="@PREFIX@/sbin/apachectl" required_files="@PKG_SYSCONFDIR@/httpd.conf" +extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" restart_cmd="apache_doit restart" +reload_cmd="apache_doit reload" # "${apache_start}" is the subcommand sent to apachectl to control how # httpd is started. It's value may be overridden in: @@ -43,15 +45,16 @@ apache_doit () { case $1 in start) action=${apache_start} ;; + reload) action=graceful ;; *) action=$1 ;; esac ${ctl_command} ${action} } -if [ -f /etc/rc.subr ] +if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ] then load_rc_config $name run_rc_command "$1" else - eval ${start_cmd} + apache_doit "$1" fi diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout index 620a76245b0..cbce564dc62 100644 --- a/www/apache6/files/config.layout +++ b/www/apache6/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.3 2001/11/26 07:34:07 jlam Exp $ +# $NetBSD: config.layout,v 1.3.2.1 2002/08/25 21:22:13 jlam Exp $ <Layout pkgsrc> prefix: @PREFIX@ @@ -14,8 +14,8 @@ htdocsdir: ${prefix}/share/httpd/htdocs manualdir: ${prefix}/share/httpd/htdocs/manual cgidir: ${exec_prefix}/libexec/cgi-bin includedir: ${prefix}/include/httpd -localstatedir: /var/run +localstatedir: /var/httpd runtimedir: /var/run logfiledir: /var/log/httpd -proxycachedir: /var/spool/httpd/proxy +proxycachedir: /var/httpd/proxy </Layout> diff --git a/www/bozohttpd/DESCR b/www/bozohttpd/DESCR index 7ec406d1f08..65c7b8de34d 100644 --- a/www/bozohttpd/DESCR +++ b/www/bozohttpd/DESCR @@ -3,4 +3,4 @@ feature is the lack of features, reducing the code size and improving verifiability. It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, -and can run multiple IP-based http servers on single machine. +and can run multiple IP-based or virtual http servers on single machine. diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 74dc1d895c1..c4193ded72b 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15.2.1 2002/06/21 23:05:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15.2.2 2002/08/25 21:22:15 jlam Exp $ # -DISTNAME= bozohttpd-5.09 +DISTNAME= bozohttpd-5.14 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= packages@netbsd.org +MAINTAINER= mrg@eterna.com.au HOMEPAGE= http://www.eterna.com.au/bozohttpd/ COMMENT= bozotic HTTP server; small and secure @@ -14,9 +14,11 @@ BUILD_DEFS+= USE_INET6 USE_BUILDLINK2= YES +MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man + .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && (${USE_INET6} == "YES") +.if defined(USE_INET6) && ${USE_INET6} == "YES" CPPFLAGS+= -DINET6 .endif diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index b7723916230..1114df391f0 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.9 2002/04/23 11:23:59 zuntum Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/08/25 21:22:16 jlam Exp $ -SHA1 (bozohttpd-5.09.tar.bz2) = 38670bf3216cf97fa2e7af1415afe0831bdd8ddc -Size (bozohttpd-5.09.tar.bz2) = 18439 bytes -SHA1 (patch-aa) = 3831938ead3fd2792d61878c10aa7ada431e8cd7 -SHA1 (patch-ab) = 3dbf43680c52c60251221243e855fc2d2f26c1ff -SHA1 (patch-ae) = 65a715f22af38be3bf2c47dd0b9dceedad23e412 +SHA1 (bozohttpd-5.14.tar.bz2) = ce4eeb87b8005b4eac5d52c8647c0ed3cae9f56e +Size (bozohttpd-5.14.tar.bz2) = 21666 bytes +SHA1 (patch-ab) = 706f678d56bbedd1b2f02f543c265d48dae8011d diff --git a/www/bozohttpd/patches/patch-aa b/www/bozohttpd/patches/patch-aa deleted file mode 100644 index 821cc55ed82..00000000000 --- a/www/bozohttpd/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/05/19 12:02:20 bad Exp $ - ---- Makefile.orig Wed May 19 21:45:11 1999 -+++ Makefile Wed May 19 21:50:17 1999 -@@ -3,4 +3,7 @@ - PROG= bozohttpd - MAN= bozohttpd.8 - -+BINDIR=$(PREFIX)/libexec -+MANDIR=$(PREFIX)/man -+ - .include <bsd.prog.mk> diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab index a944326c50e..52063c8052c 100644 --- a/www/bozohttpd/patches/patch-ab +++ b/www/bozohttpd/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2001/12/14 16:26:03 mrg Exp $ +$NetBSD: patch-ab,v 1.8.2.1 2002/08/25 21:22:18 jlam Exp $ ---- bozohttpd.8.in.orig Sat Sep 22 20:10:00 2001 -+++ bozohttpd.8.in Sat Dec 15 03:15:41 2001 -@@ -172,8 +172,8 @@ +--- bozohttpd.8.in.orig Fri Aug 23 15:43:44 2002 ++++ bozohttpd.8.in Fri Aug 23 15:48:04 2002 +@@ -197,8 +197,8 @@ .Xr inetd.conf 5 entry would be: .Bd -literal @@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.8 2001/12/14 16:26:03 mrg Exp $ .Ed .Pp This would serve web pages from +@@ -218,7 +218,7 @@ + .Pp + To configure set of virtual hosts, one would use an entry like: + .Bd -literal +-www stream tcp nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd -v /var/vroot /var/www ++www stream tcp nowait:600 httpd @PREFIX@/libexec/bozohttpd bozohttpd -v /var/vroot /var/www + .Ed + .Pp + and inside diff --git a/www/bozohttpd/patches/patch-ae b/www/bozohttpd/patches/patch-ae deleted file mode 100644 index 325b62195b3..00000000000 --- a/www/bozohttpd/patches/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/04/23 11:24:00 zuntum Exp $ - ---- bozohttpd.c.orig Sat Sep 22 12:10:00 2001 -+++ bozohttpd.c -@@ -359,6 +359,7 @@ - case 'c': - #ifndef NO_CGIBIN_SUPPORT - cgibin = optarg; -+ debug((DEBUG_OBESE, "cgibin (cgi-bin directory) is %s", cgibin)); - break; - #else - error(1, "CGI is not enabled"); -@@ -1734,7 +1735,7 @@ - int savederrno; - - /* only log if the level is low enough */ -- if (level < dflag) -+ if (dflag < level) - return; - - savederrno = errno; diff --git a/www/communicator/MESSAGE b/www/communicator/MESSAGE index c082935f9dd..d79e98a66a4 100644 --- a/www/communicator/MESSAGE +++ b/www/communicator/MESSAGE @@ -1,5 +1,5 @@ ============================================================================== -$NetBSD: MESSAGE,v 1.1 2001/11/01 02:16:34 zuntum Exp $ +$NetBSD: MESSAGE,v 1.1.2.1 2002/08/25 21:22:19 jlam Exp $ alpha: The Digital UNIX version of Netscape requires COMPAT_OSF1 in your kernel, plus /emul/osf1 libraries. @@ -17,4 +17,7 @@ sparc: The SunOS version of Netscape requires COMPAT_SUNOS in your kernel, version is 'netscape_nis'. Netscape appears to have stopped with 4.61. SunOS 'navigator' has problems saving files, 'communicator' does not. +sparc: The Solaris version of Netscape requires COMPAT_SVR4 in your kernel, + plus /emul/svr4 libraries. + ============================================================================== diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.post index 28a29cba0a3..7d98b1e1ee0 100644 --- a/www/communicator/PLIST.post +++ b/www/communicator/PLIST.post @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:13:03 skrll Exp $ +@comment $NetBSD: PLIST.post,v 1.2.2.1 2002/08/25 21:22:19 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble @@ -18,6 +18,6 @@ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java @dirrm lib/netscape/${BINNAME}-${NS_VERS} -@exec ${MKDIR} -p %D/lib/netscape/plugins +@exec ${MKDIR} %D/lib/netscape/plugins @unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || true @unexec ${RMDIR} %D/lib/netscape 2>/dev/null || true diff --git a/www/curl/distinfo b/www/curl/distinfo index 0a32816084c..eee1dcd48ac 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:40 jlam Exp $ +$NetBSD: distinfo,v 1.10.2.2 2002/08/25 21:22:20 jlam Exp $ SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101 Size (curl-7.9.7.tar.gz) = 717489 bytes SHA1 (patch-aa) = 5990fe1f4d583847751549f2e647f23b2bbbbe96 +SHA1 (patch-ab) = 7054f8d9f19fa2a9d7b816fd58ae08ef97bcbb1c diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab new file mode 100644 index 00000000000..c137c2154d4 --- /dev/null +++ b/www/curl/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.2.4.2 2002/08/25 21:22:22 jlam Exp $ + +--- lib/ftp.c.orig Mon Apr 29 11:57:25 2002 ++++ lib/ftp.c Fri Jul 19 04:22:35 2002 +@@ -1576,12 +1576,13 @@ + + #ifdef HAVE_STRFTIME + if(data->set.get_filetime && data->info.filetime) { ++ time_t filetime = data->info.filetime; + struct tm *tm; + #ifdef HAVE_LOCALTIME_R + struct tm buffer; +- tm = (struct tm *)localtime_r(&data->info.filetime, &buffer); ++ tm = (struct tm *)localtime_r(&filetime, &buffer); + #else +- tm = localtime((unsigned long *)&data->info.filetime); ++ tm = localtime(&filetime); + #endif + /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */ + strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S %Z\r\n", diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 0f53390431b..235f5b85d80 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,35 +1,60 @@ # -# $NetBSD: Makefile,v 1.9.2.1 2002/06/30 06:24:32 jlam Exp $ +# $NetBSD: Makefile,v 1.9.2.2 2002/08/25 21:22:23 jlam Exp $ # -DISTNAME= cvsweb-1.112 -CATEGORIES= net -MASTER_SITES= http://stud.fh-heilbronn.de/~zeller/download/ +DISTNAME= cvsweb-2.0.5 +CATEGORIES= www +MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/ -MAINTAINER= kim@tac.nyc.ny.us -HOMEPAGE= http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/ +MAINTAINER= lukem@netbsd.org +HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html COMMENT= Web interface for browsing a CVS repository USE_BUILDLINK2= YES -WRKSRC= ${WRKDIR}/cvsweb PKG_SYSCONFSUBDIR?= httpd EGDIR= ${PREFIX}/share/examples/${PKGBASE} +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -CONF_FILES= ${EGDIR}/cvsweb.conf.default ${PKG_SYSCONFDIR}/cvsweb.conf +CVSWEB_CONF_FILES= cvsweb.conf \ + cvsweb.conf-freebsd \ + cvsweb.conf-netbsd \ + cvsweb.conf-openbsd \ + cvsweb.conf-ruby + +CVSWEB_ICONS= back.gif dir.gif \ + miniback.gif minidir.gif minitext.gif text.gif + +CVSWEB_DOCS= ChangeLog INSTALL README README.FreeBSD \ + TODO TODO.FreeBSD + +CONF_FILES= ${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf + +.if !exists(/usr/bin/rlog) +DEPENDS+= rcs-[0-9]*:../../devel/rcs +.endif do-build: ${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak ${SED} -e 's,/usr/bin/perl,${PERL5},' \ - -e 's,/usr/local/web/apache/conf/,${PKG_SYSCONFDIR}/,' \ + -e 's,/usr/local/etc/cvsweb/,${PKG_SYSCONFDIR}/,' \ ${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsweb - ${INSTALL_DATA} ${WRKSRC}/cvsweb.conf \ - ${PREFIX}/share/examples/cvsweb/cvsweb.conf.default + ${INSTALL_DATA_DIR} ${EGDIR} +.for f in ${CVSWEB_CONF_FILES} + ${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}/${f} +.endfor + ${INSTALL_DATA_DIR} ${EGDIR}/icons +.for f in ${CVSWEB_ICONS} + ${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f} +.endfor + ${INSTALL_DATA_DIR} ${DOCDIR} +.for f in ${CVSWEB_DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} +.endfor .include "../../lang/perl5/buildlink2.mk" diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST index 897163017f2..cacf0cf7af6 100644 --- a/www/cvsweb/PLIST +++ b/www/cvsweb/PLIST @@ -1,4 +1,22 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:38 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:23 jlam Exp $ libexec/cgi-bin/cvsweb.cgi -share/examples/cvsweb/cvsweb.conf.default +share/doc/cvsweb/ChangeLog +share/doc/cvsweb/INSTALL +share/doc/cvsweb/README +share/doc/cvsweb/README.FreeBSD +share/doc/cvsweb/TODO +share/doc/cvsweb/TODO.FreeBSD +share/examples/cvsweb/cvsweb.conf +share/examples/cvsweb/cvsweb.conf-freebsd +share/examples/cvsweb/cvsweb.conf-netbsd +share/examples/cvsweb/cvsweb.conf-openbsd +share/examples/cvsweb/cvsweb.conf-ruby +share/examples/cvsweb/icons/back.gif +share/examples/cvsweb/icons/dir.gif +share/examples/cvsweb/icons/miniback.gif +share/examples/cvsweb/icons/minidir.gif +share/examples/cvsweb/icons/minitext.gif +share/examples/cvsweb/icons/text.gif +@dirrm share/examples/cvsweb/icons @dirrm share/examples/cvsweb +@dirrm share/doc/cvsweb diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo index 78b698f8a6f..fcb6cb7ed34 100644 --- a/www/cvsweb/distinfo +++ b/www/cvsweb/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/10/15 17:25:10 martti Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:24 jlam Exp $ -SHA1 (cvsweb-1.112.tar.gz) = 4dc996712c365f064a8b8d26a69b3df083ecac0a -Size (cvsweb-1.112.tar.gz) = 37239 bytes -SHA1 (patch-aa) = 318c11abe236a6c5d49cf013817da6849b2855da +SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205 +Size (cvsweb-2.0.5.tar.gz) = 51948 bytes +SHA1 (patch-aa) = be834a845486db0f104ec0ae990a5452e4f03811 +SHA1 (patch-ab) = 8bb35592e5ba45783d2c1026d5036539fb808f24 diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa index ace0a500130..b7115ff9996 100644 --- a/www/cvsweb/patches/patch-aa +++ b/www/cvsweb/patches/patch-aa @@ -1,10 +1,18 @@ -$NetBSD: patch-aa,v 1.3 2001/10/15 17:25:10 martti Exp $ +$NetBSD: patch-aa,v 1.3.2.1 2002/08/25 21:22:25 jlam Exp $ ---- cvsweb.cgi.orig Mon Oct 15 13:45:06 2001 -+++ cvsweb.cgi Mon Oct 15 13:48:30 2001 +--- cvsweb.cgi.orig Tue Jul 23 15:58:32 2002 ++++ cvsweb.cgi Wed Jul 24 11:01:53 2002 @@ -1,4 +1,4 @@ --#!/usr/bin/perl -wsT -+#!/usr/bin/perl -s +-#!/usr/bin/perl -wT ++#!/usr/bin/perl -w # # cvsweb - a CGI interface to CVS trees. # +@@ -3631,6 +3631,7 @@ + } + + sub html_footer() { ++ return if ($address eq ""); + print "<hr noshade>\n<address>$address</address>\n</body>\n</html>\n"; + } + diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab new file mode 100644 index 00000000000..9414700096d --- /dev/null +++ b/www/cvsweb/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:26 jlam Exp $ + +--- cvsweb.conf.orig Wed Jul 10 17:30:56 2002 ++++ cvsweb.conf Wed Jul 24 11:02:29 2002 +@@ -495,6 +495,7 @@ + @cvs_options = qw(-lf); + + push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD'); ++push @cvs_options, '-u' if ($uname eq 'NetBSD'); + + # Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access + # mode) option, which considerably speeds up checkouts over NFS. diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 528b3fac539..75500f9a386 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6.2.2 2002/06/30 06:24:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.3 2002/08/25 21:22:26 jlam Exp $ # -DISTNAME= dillo-0.6.5 -PKGREVISION= 1 +DISTNAME= dillo-0.6.6 CATEGORIES= www MASTER_SITES= http://dillo.cipsga.org.br/download/ diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 3e42413fae7..aae5b7c18fb 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:03:42 jlam Exp $ +$NetBSD: distinfo,v 1.7.2.2 2002/08/25 21:22:26 jlam Exp $ -SHA1 (dillo-0.6.5.tar.gz) = 34e11b573e577d24fc20a2b8a9a13f44883ecf51 -Size (dillo-0.6.5.tar.gz) = 310323 bytes +SHA1 (dillo-0.6.6.tar.gz) = 6ff27fe122f53f2e554a5377b67258d2df7ec381 +Size (dillo-0.6.6.tar.gz) = 310331 bytes SHA1 (patch-aa) = 1ae5a680306102d03d587acfbbf16cbf1f5df366 SHA1 (patch-ab) = 1687c870ae8f6c5a3be4a91335a6d913d9773ff2 diff --git a/www/elinks/distinfo b/www/elinks/distinfo index 0f94d71faa3..2c50aa29a99 100644 --- a/www/elinks/distinfo +++ b/www/elinks/distinfo @@ -1,4 +1,4 @@ - +$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:22:27 jlam Exp $ SHA1 (elinks-0.3.0.tar.bz2) = c531d7922b1fb51fb8eeda960ff1e41c656db03e Size (elinks-0.3.0.tar.bz2) = 446820 bytes diff --git a/www/kannel/Makefile b/www/kannel/Makefile index 75cdd16f268..2b4c3dc4e0d 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -1,24 +1,25 @@ -# $NetBSD: Makefile,v 1.8.2.2 2002/07/01 17:45:14 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.3 2002/08/25 21:22:28 jlam Exp $ # DISTNAME= gateway-${KANNEL_VER} PKGNAME= kannel-${KANNEL_VER} CATEGORIES= www net -MASTER_SITES= http://www.kannel.3glab.org/download/${KANNEL_VER}/ +MASTER_SITES= http://www.kannel.org/download/${KANNEL_VER}/ MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.kannel.org/ -COMMENT= open source WAP and SMS gateway +HOMEPAGE= http://www.kannel.org +COMMENT= Open source WAP and SMS gateway -KANNEL_VER= 1.0.3 +KANNEL_VER= 1.2.0 GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GMAKE= YES USE_PERL5= YES -USE_PTHREAD= native pth +PTHREAD_OPTS+= require CONFIGURE_ARGS+= --disable-docs +CONFIGURE_ARGS+= --disable-ssl CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml .include "../../textproc/libxml2/buildlink2.mk" diff --git a/www/kannel/PLIST b/www/kannel/PLIST index b97a1c3acba..cb27385ffc4 100644 --- a/www/kannel/PLIST +++ b/www/kannel/PLIST @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:14 zuntum Exp $ -bin/bearerbox -bin/smsbox -bin/wapbox +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:29 jlam Exp $ +bin/seewbmp bin/wmlsc bin/wmlsdasm -bin/seewbmp -bin/run_kannel_box -bin/start-stop-daemon +man/man1/seewbmp.1 +man/man1/wmlsc.1 +man/man1/wmlsdasm.1 +man/man8/kannel.8 +man/man8/run_kannel_box.8 +sbin/bearerbox +sbin/run_kannel_box +sbin/smsbox +sbin/wapbox diff --git a/www/kannel/distinfo b/www/kannel/distinfo index 3f06dc8c8e8..c240c0abc29 100644 --- a/www/kannel/distinfo +++ b/www/kannel/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/07/21 14:16:53 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:22:29 jlam Exp $ -SHA1 (gateway-1.0.3.tar.gz) = 5ee499460f9a98b11fdd9bc48ac7607e896206a6 -Size (gateway-1.0.3.tar.gz) = 656472 bytes -SHA1 (patch-aa) = ebe7f7d88e57620e13c25bb85ff6af5446583417 -SHA1 (patch-ab) = 55cfc733d2cd278b710c5509016342266592ac14 -SHA1 (patch-ac) = bfde3bb30215f18be89c03923d6b2262feb4d060 +SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2 +Size (gateway-1.2.0.tar.gz) = 2094749 bytes +SHA1 (patch-aa) = 5982f3ddffe19910aa433b7c47c734f18387bf0e +SHA1 (patch-ab) = df965c5d3bf3751c46d1650eb3f8e2adcfb66277 diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa index af575fdbc1e..a8705be728a 100644 --- a/www/kannel/patches/patch-aa +++ b/www/kannel/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2001/07/21 14:16:54 wiz Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/08/25 21:22:30 jlam Exp $ ---- utils/start-stop-daemon.c.orig Fri May 26 20:05:53 2000 -+++ utils/start-stop-daemon.c Fri Jun 29 09:07:15 2001 +--- utils/start-stop-daemon.c.orig Mon Apr 23 16:52:29 2001 ++++ utils/start-stop-daemon.c Sun Jul 7 21:28:04 2002 @@ -34,8 +34,13 @@ - #elif defined(__FreeBSD__) + #elif defined(__FreeBSD__) || defined(__APPLE__) #define FreeBSD #else +#include <sys/param.h> diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab index 39e3a87847e..7e46c7ba952 100644 --- a/www/kannel/patches/patch-ab +++ b/www/kannel/patches/patch-ab @@ -1,22 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/07/21 14:16:54 wiz Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2002/08/25 21:22:31 jlam Exp $ ---- Makefile.in.orig Tue Feb 13 13:12:02 2001 -+++ Makefile.in Fri Jun 29 08:59:52 2001 -@@ -87,7 +87,7 @@ +--- Makefile.in.orig Tue Jun 11 20:59:52 2002 ++++ Makefile.in Sun Jul 7 21:30:27 2002 +@@ -90,7 +90,7 @@ # Set this to something if you want all installed binaries to have a suffix. # Version number is common. --suffix = -$(VERSION) +-suffix = $(SUFFIX) +suffix = # # You probably don't need to touch anything below this, if you're just -@@ -185,7 +185,7 @@ - install: all - $(INSTALL) -d $(bindir) - for prog in $(progs); do \ -- $(INSTALL) $$prog $(bindir)/`basename $$prog`$(suffix); \ -+ ${BSD_INSTALL_PROGRAM} $$prog $(bindir)/`basename $$prog`${suffix}; \ - done - - install-docs: diff --git a/www/kannel/patches/patch-ac b/www/kannel/patches/patch-ac deleted file mode 100644 index a9f21cc2a12..00000000000 --- a/www/kannel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2001/07/21 14:16:54 wiz Exp $ - ---- configure.orig Tue Mar 27 17:23:16 2001 -+++ configure Fri Jun 29 09:00:47 2001 -@@ -542,7 +542,7 @@ - - - --docdir='${prefix}/doc/kannel' -+docdir='${prefix}/share/doc/kannel' - - - # Extract the first word of "gcc", so it can be a program name with args. diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index fe168325e1a..40eb08369c6 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2.2.4 2002/06/30 04:00:46 jlam Exp $ +# $NetBSD: Makefile,v 1.2.2.5 2002/08/25 21:22:34 jlam Exp $ # -PKGNAME= links-gui-2.0 +PKGNAME= links-gui-2.1.0.2 COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-[0-9]* @@ -16,4 +16,4 @@ CONFIGURE_ARGS+= --enable-graphics .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../www/links/Makefile.common" diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo index 8da05d02df1..5c0a7137687 100644 --- a/www/links-gui/distinfo +++ b/www/links-gui/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 19:04:10 jlam Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:22:35 jlam Exp $ -SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d -Size (links-2.0.tar.bz2) = 3499871 bytes +SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 +Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/links/Makefile b/www/links/Makefile index 4a7d2df8e5e..2e525e19edd 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8.2.4 2002/06/30 04:00:45 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.5 2002/08/25 21:22:32 jlam Exp $ # -PKGNAME= links-2.0 +PKGNAME= links-2.1.0.2 COMMENT= Lynx-like text WWW browser -CONFLICTS+= links-gui-[0-9]* elinks-[0-9] +CONFLICTS+= links-gui-[0-9]* elinks-[0-9]* USE_BUILDLINK2= YES diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 37ec2a69977..d3b779b96d6 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.1.2.2 2002/06/23 19:04:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.1.2.3 2002/08/25 21:22:33 jlam Exp $ # -DISTNAME= links-2.0 +DISTNAME= links-2.1pre2 CATEGORIES= www MASTER_SITES= \ http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \ diff --git a/www/links/distinfo b/www/links/distinfo index 5a1c66991df..daea1395204 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:08 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:33 jlam Exp $ -SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d -Size (links-2.0.tar.bz2) = 3499871 bytes +SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 +Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 5d8bea82cbd..4d1973ba555 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/05/04 17:06:48 fredb Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:38 jlam Exp $ SHA1 (lynx2.8.5dev.7.tar.bz2) = 8e9eb4bf11944c24517e99ec0ef76b203022c5fe Size (lynx2.8.5dev.7.tar.bz2) = 1966524 bytes SHA1 (patch-aa) = 8935e11ef53dc6a686b2fc19359aa2db7fffc226 +SHA1 (patch-ab) = 5f683f4cf53582db6b2cbc8e37f840a6e51e3345 SHA1 (patch-ae) = 116b1a797f52b214c125dd362ed1161bab78313f diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab new file mode 100644 index 00000000000..d94a02927b1 --- /dev/null +++ b/www/lynx-current/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:40 jlam Exp $ + +--- src/LYCurses.c.orig Wed Aug 21 21:16:48 2002 ++++ src/LYCurses.c +@@ -564,9 +564,7 @@ PUBLIC void curses_style ARGS2( + } + #endif /* USE_COLOR_STYLE */ + +-#ifndef USE_SLANG + PRIVATE BOOL lynx_called_initscr = FALSE; +-#endif + + #if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS) + /* +@@ -1274,7 +1272,7 @@ PUBLIC void stop_curses NOARGS + lynx_nl2crlf(TRUE); + lynx_enable_mouse (0); + #if (!defined(WIN_EX) || defined(__CYGWIN__)) /* @@@ */ +- if(LYscreen) { ++ if(LYscreen || lynx_called_initscr) { + endwin(); /* stop curses */ + LYDELSCR(); + } diff --git a/www/lynx/Makefile b/www/lynx/Makefile index a0b9559a058..cdf576d2cfd 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.49.2.1 2002/06/30 06:24:34 jlam Exp $ +# $NetBSD: Makefile,v 1.49.2.2 2002/08/25 21:22:35 jlam Exp $ # DISTNAME= lynx2.8.4rel.1 -PKGNAME= lynx-2.8.4.1.2 +PKGNAME= lynx-2.8.4.1.3 CATEGORIES= www -MASTER_SITES= http://lynx.isc.org/release/ \ - ftp://lynx.isc.org/lynx/ \ +MASTER_SITES= http://lynx.isc.org/lynx2.8.4/ \ + ftp://lynx.isc.org/lynx2.8.4/ \ ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/ EXTRACT_SUFX= .tar.bz2 @@ -14,7 +14,8 @@ PATCH_SITES= http://lynx.isc.org/lynx2.8.4/patches/ \ ftp://lynx.isc.org/lynx/lynx2.8.4/patches/ \ ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/patches/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/patches/ -PATCHFILES= lynx2.8.4rel.1a.patch lynx2.8.4rel.1b.patch +PATCHFILES= lynx2.8.4rel.1a.patch lynx2.8.4rel.1b.patch \ + lynx2.8.4rel.1c.patch PATCH_DIST_STRIP= -p1 MAINTAINER= fredb@netbsd.org diff --git a/www/lynx/distinfo b/www/lynx/distinfo index fd3f23d3b2c..f7c1f4e47f1 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/12/31 19:31:07 fredb Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:36 jlam Exp $ SHA1 (lynx2.8.4rel.1.tar.bz2) = 11285022fbe6910fb0a47adc14581ceb0c3bfc98 Size (lynx2.8.4rel.1.tar.bz2) = 1940531 bytes @@ -6,5 +6,8 @@ SHA1 (lynx2.8.4rel.1a.patch) = 65473d215a17a80c1c1203c6c35c4fc7c6951a5d Size (lynx2.8.4rel.1a.patch) = 7530 bytes SHA1 (lynx2.8.4rel.1b.patch) = 323edfa079bf8e6ed517e1031a6797ade4fe823a Size (lynx2.8.4rel.1b.patch) = 8939 bytes +SHA1 (lynx2.8.4rel.1c.patch) = 47c9d74c063714b499f03135f3ecba894a037a10 +Size (lynx2.8.4rel.1c.patch) = 9270 bytes SHA1 (patch-aa) = 123ebe71a00dfdd309d54b96f52ea83002d43cb2 +SHA1 (patch-ab) = dd533235a5ee83b946df76d29d26dbbb679f9ccf SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260 diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab new file mode 100644 index 00000000000..fd302eb702b --- /dev/null +++ b/www/lynx/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:38 jlam Exp $ + +--- src/LYCurses.c.orig Tue Aug 20 22:33:51 2002 ++++ src/LYCurses.c +@@ -548,9 +548,7 @@ PUBLIC void curses_style ARGS2( + } + #endif /* USE_COLOR_STYLE */ + +-#ifndef USE_SLANG + PRIVATE BOOL lynx_called_initscr = FALSE; +-#endif + + #if HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS + /* +@@ -1250,7 +1248,7 @@ PUBLIC void stop_curses NOARGS + lynx_nl2crlf(TRUE); + lynx_enable_mouse (0); + #if (!defined(WIN_EX) || defined(__CYGWIN__)) /* @@@ */ +- if(LYscreen) { ++ if(LYscreen || lynx_called_initscr) { + endwin(); /* stop curses */ + LYDELSCR(); + } diff --git a/www/opera6/Makefile b/www/opera6/Makefile index b7ee6ca6728..9a9a35fd502 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8.2.3 2002/06/23 19:04:26 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.4 2002/08/25 21:22:40 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -39,9 +39,9 @@ DEPENDS+= suse_libpng>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libpng DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 OPERA_ARCH= i386 -OPERA_DIR= 601/final/en/qt_static -OPERA_DIST_VERSION= 6.01-20020523.1-static-qt -OPERA_PKG_VERSION= 6.01 +OPERA_DIR= 602/final/en/qt_static +OPERA_DIST_VERSION= 6.02-20020701.1-static-qt +OPERA_PKG_VERSION= 6.02 .endif RPMFILES= ${DISTFILES} diff --git a/www/opera6/distinfo b/www/opera6/distinfo index 458c8078147..e3036e9f5bc 100644 --- a/www/opera6/distinfo +++ b/www/opera6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:26 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:41 jlam Exp $ -SHA1 (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4a2ea0df5979e0b3145bdfa4d0ea15b3cbb64fa7 -Size (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4840045 bytes +SHA1 (./opera-6.02-20020701.1-static-qt.i386.rpm) = 8d043a6340907289011a6be7a3bd3ffa2b740a2a +Size (./opera-6.02-20020701.1-static-qt.i386.rpm) = 4915848 bytes diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 8c993ae6b40..5d7cf162f81 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10.2.1 2002/06/30 06:24:34 jlam Exp $ +# $NetBSD: Makefile,v 1.10.2.2 2002/08/25 21:22:41 jlam Exp $ -DISTNAME= sitecopy-0.10.15 +DISTNAME= sitecopy-0.11.4 CATEGORIES= www MASTER_SITES= http://www.lyra.org/sitecopy/ diff --git a/www/sitecopy/PLIST b/www/sitecopy/PLIST index 68de7fabb89..8a8761258c2 100644 --- a/www/sitecopy/PLIST +++ b/www/sitecopy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:49 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:42 jlam Exp $ bin/sitecopy man/man1/sitecopy.1 share/doc/sitecopy/FAQ @@ -10,6 +10,7 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sitecopy.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/sitecopy.mo share/sitecopy/changes.awk diff --git a/www/sitecopy/distinfo b/www/sitecopy/distinfo index 9590922f3f6..70b3c91bcbe 100644 --- a/www/sitecopy/distinfo +++ b/www/sitecopy/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/15 23:27:07 jlam Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/08/25 21:22:42 jlam Exp $ -SHA1 (sitecopy-0.10.15.tar.gz) = 810bf312b830366985e9f6182b8379d28f9b3118 -Size (sitecopy-0.10.15.tar.gz) = 627536 bytes -SHA1 (patch-aa) = ebd41e69b9a6c4ba88bb344d8dce67aa669e248f +SHA1 (sitecopy-0.11.4.tar.gz) = 765e40e769e91fff0323e4cae73ad8048b453a2c +Size (sitecopy-0.11.4.tar.gz) = 737326 bytes +SHA1 (patch-aa) = ba1955f8cd86c16bca08872105db91c1532dc882 +SHA1 (patch-ab) = d8ce1af8b87a0d156a1795fef824553f64b22f59 diff --git a/www/sitecopy/patches/patch-aa b/www/sitecopy/patches/patch-aa index 6e46eabf385..6aec080e559 100644 --- a/www/sitecopy/patches/patch-aa +++ b/www/sitecopy/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/15 23:27:07 jlam Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/08/25 21:22:43 jlam Exp $ ---- Makefile.in.orig Wed Feb 14 18:39:36 2001 +--- Makefile.in.orig Mon Jan 14 06:02:02 2002 +++ Makefile.in -@@ -21,8 +21,8 @@ - datadir = $(prefix)/@DATADIRNAME@ - # Previously I had: - # datadir = @datadir@/sitecopy +@@ -15,7 +15,7 @@ + bindir = @bindir@ + mandir = @mandir@ + man1dir = $(mandir)/man1 -docdir = $(prefix)/doc/sitecopy --sc_datadir = $(datadir)/sitecopy +docdir = $(prefix)/share/doc/sitecopy -+sc_datadir = $(prefix)/share/sitecopy - - top_srcdir = @top_srcdir@ - top_builddir = . + localedir = $(datadir)/locale + datadir = @datadir@ + pkgdatadir = $(datadir)/@PACKAGE@ diff --git a/www/sitecopy/patches/patch-ab b/www/sitecopy/patches/patch-ab new file mode 100644 index 00000000000..f0420fc698a --- /dev/null +++ b/www/sitecopy/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/08/25 21:22:44 jlam Exp $ + +--- src/console_fe.c.orig Mon Jan 14 05:42:21 2002 ++++ src/console_fe.c +@@ -44,6 +44,9 @@ + #ifdef HAVE_ERRNO_H + #include <errno.h> + #endif ++#ifdef HAVE_LOCALE_H ++#include <locale.h> ++#endif + #include <signal.h> + #include <time.h> + #include <ctype.h> diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index 09e4904f26c..ffe72c38ec2 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4.2.3 2002/06/30 06:24:35 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4.2.4 2002/08/25 21:22:44 jlam Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -95,8 +95,7 @@ CONFIGURE_ENV+= use_cookie=y CONFIGURE_ENV+= use_cookie=n .endif .if ${W3M_USE_SSL} == YES -USE_SSL= YES -CONFIGURE_ENV+= use_ssl=y use_ssl_verify=n +CONFIGURE_ENV+= use_ssl=y use_ssl_verify=y CONFIGURE_ARGS+= --ssl-includedir=${SSLBASE}/include/openssl CONFIGURE_ARGS+= --ssl-libdir=${SSLBASE}/lib .include "../../security/openssl/buildlink2.mk" @@ -111,9 +110,9 @@ CONFIGURE_ENV+= lynx_key=n HELP_W3M= -w3m .endif .if ${W3M_USE_IMAGE} == YES -CONFIGURE_ENV+= use_image=y +CONFIGURE_ENV+= use_image=y .else -CONFIGURE_ENV+= use_image=n +CONFIGURE_ENV+= use_image=n .endif CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y CONFIGURE_ENV+= use_help_cgi=n use_migemo=n diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile index 941d49f7301..c55b1f19dcd 100644 --- a/www/wdg-validate/Makefile +++ b/www/wdg-validate/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4.2.1 2002/07/01 17:45:14 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2002/08/25 21:22:45 jlam Exp $ # DISTNAME= validate -PKGNAME= wdg-validate-1.0.3 +PKGNAME= wdg-validate-1.0.4 CATEGORIES= www MASTER_SITES= http://www.htmlhelp.com/tools/validator/offline/ -DISTFILES= validate sgml-lib.tar.gz README +DISTFILES= validate sgml-lib-1.0.tar.gz README MAINTAINER= norm@sandbox.org.uk HOMEPAGE= http://www.htmlhelp.com/tools/validator/offline/ @@ -13,8 +13,8 @@ COMMENT= HTML validator from the Web Design Group DEPENDS+= lq-sp>=1.3.4.5:../../textproc/lq-sp -DIST_SUBDIR= wdg-validate -EXTRACT_ONLY= sgml-lib.tar.gz +DIST_SUBDIR= ${PKGNAME} +EXTRACT_ONLY= sgml-lib-1.0.tar.gz USE_BUILDLINK2= YES REPLACE_PERL= validate.netbsd diff --git a/www/wdg-validate/distinfo b/www/wdg-validate/distinfo index a8a537283e4..01a9cf3c14f 100644 --- a/www/wdg-validate/distinfo +++ b/www/wdg-validate/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/02/14 16:29:03 abs Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:46 jlam Exp $ -SHA1 (wdg-validate/validate) = 1150b3c540f304203e0539c320f3d2b7fd43ad6f -Size (wdg-validate/validate) = 15039 bytes -SHA1 (wdg-validate/sgml-lib.tar.gz) = 57bc51940b873b66af5c585e1c5d314512bd55eb -Size (wdg-validate/sgml-lib.tar.gz) = 159465 bytes -SHA1 (wdg-validate/README) = 0d287e7b41d4c5cb26d22fc22300b229c28ae66a -Size (wdg-validate/README) = 2418 bytes +SHA1 (wdg-validate-1.0.4/validate) = eb9ea352528fa5db2cbedc5ad4dbe59aa91d5e58 +Size (wdg-validate-1.0.4/validate) = 15210 bytes +SHA1 (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 57bc51940b873b66af5c585e1c5d314512bd55eb +Size (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 159465 bytes +SHA1 (wdg-validate-1.0.4/README) = 0d287e7b41d4c5cb26d22fc22300b229c28ae66a +Size (wdg-validate-1.0.4/README) = 2418 bytes SHA1 (patch-aa) = e9759bb7d3b949573a87687cc89ecdc3a8aabf61 |