Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

re-import (imported wrong branch)

  • Loading branch information...
commit d2834d8e76478557da90548110689240867105c4 1 parent 91cb79e
itojun authored
View
37 netbsd/pkgsrc/lang/ruby/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: ruby
+# Version required: 1.2.5
+# Date created: 04 September 1997
+# Whom: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
+#
+# $Id: Makefile,v 1.1.1.1 1999/08/10 09:14:31 itojun Exp $
+#
+
+DISTNAME= ruby-1.2.5
+CATEGORIES= lang
+MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
+ ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
+ ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
+ ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
+ ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
+ ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
+ ftp://ftp.v6.kame.net/pub/kame/misc/
+PATCHFILES= ruby-125-v6-19990509.diff.gz
+PATCH_DIST_STRIP= -p1
+
+MAINTAINER= itojun@kame.net
+
+GNU_CONFIGURE= yes
+#USE_AUTOCONF= yes
+MAN1= ruby.1
+
+BRANCH_NAME= 1.2
+
+post-install:
+ strip ${PREFIX}/bin/ruby
+
+test:
+ @(cd ${WRKSRC}; make test)
+
+.include "../../mk/bsd.pkg.mk"
View
4 netbsd/pkgsrc/lang/ruby/files/md5
@@ -0,0 +1,4 @@
+$NetBSD$
+
+MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-125-v6-19990509.diff.gz) = 5e636425ca5680a52e7fa9f687303f42
View
1  netbsd/pkgsrc/lang/ruby/pkg/COMMENT
@@ -0,0 +1 @@
+An object-oriented interpreted scripting language
View
18 netbsd/pkgsrc/lang/ruby/pkg/DESCR
@@ -0,0 +1,18 @@
+Ruby is the interpreted scripting language for quick and
+easy object-oriented programming. It has many features to
+process text files and to do system management tasks (as in
+perl). It is simple, straight-forward, and extensible.
+
+Features of ruby is shown below.
+
+ + Simple Syntax
+ + *Normal* Object-Oriented features(ex. class, method calls)
+ + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
+ + Operator Overloading
+ + Exception Handling
+ + Iterators and Closures
+ + Garbage Collection
+ + Dynamic Loading of Object files(on some architecture)
+ + Highly Portable(works on many UNIX machines)
+
+The ruby home page is at http://www.netlab.co.jp/ruby/.
View
92 netbsd/pkgsrc/lang/ruby/pkg/PLIST
@@ -0,0 +1,92 @@
+bin/ruby
+lib/ruby/i386-netbsd/addrinfo.h
+lib/ruby/i386-netbsd/libruby.a
+lib/ruby/i386-netbsd/y.tab.h
+lib/ruby/i386-netbsd/tkutil.so
+lib/ruby/i386-netbsd/tcltklib.so
+lib/ruby/i386-netbsd/md5.so
+lib/ruby/i386-netbsd/kconv.so
+lib/ruby/i386-netbsd/fcntl.so
+lib/ruby/i386-netbsd/etc.so
+lib/ruby/i386-netbsd/dbm.so
+lib/ruby/i386-netbsd/curses.so
+lib/ruby/i386-netbsd/defines.h
+lib/ruby/i386-netbsd/dln.h
+lib/ruby/i386-netbsd/env.h
+lib/ruby/i386-netbsd/fnmatch.h
+lib/ruby/i386-netbsd/intern.h
+lib/ruby/i386-netbsd/node.h
+lib/ruby/i386-netbsd/re.h
+lib/ruby/i386-netbsd/regex.h
+lib/ruby/i386-netbsd/ruby.h
+lib/ruby/i386-netbsd/rubyio.h
+lib/ruby/i386-netbsd/rubysig.h
+lib/ruby/i386-netbsd/st.h
+lib/ruby/i386-netbsd/util.h
+lib/ruby/i386-netbsd/version.h
+lib/ruby/i386-netbsd/config.h
+lib/ruby/i386-netbsd/rbconfig.rb
+lib/ruby/getoptlong.rb
+lib/ruby/profile.rb
+lib/ruby/tkvirtevent.rb
+lib/ruby/tktext.rb
+lib/ruby/tkscrollbox.rb
+lib/ruby/tkpalette.rb
+lib/ruby/tkmngfocus.rb
+lib/ruby/tkmenubar.rb
+lib/ruby/tkfont.rb
+lib/ruby/tkentry.rb
+lib/ruby/tkdialog.rb
+lib/ruby/tkclass.rb
+lib/ruby/tkcanvas.rb
+lib/ruby/tkbgerror.rb
+lib/ruby/tkafter.rb
+lib/ruby/tk.rb
+lib/ruby/tcltk.rb
+lib/ruby/English.rb
+lib/ruby/Env.rb
+lib/ruby/base64.rb
+lib/ruby/cgi-lib.rb
+lib/ruby/complex.rb
+lib/ruby/date.rb
+lib/ruby/find.rb
+lib/ruby/date2.rb
+lib/ruby/debug.rb
+lib/ruby/delegate.rb
+lib/ruby/e2mmap.rb
+lib/ruby/eregex.rb
+lib/ruby/final.rb
+lib/ruby/finalize.rb
+lib/ruby/ftplib.rb
+lib/ruby/ftools.rb
+lib/ruby/getopts.rb
+lib/ruby/importenv.rb
+lib/ruby/jcode.rb
+lib/ruby/mailread.rb
+lib/ruby/mathn.rb
+lib/ruby/matrix.rb
+lib/ruby/mkmf.rb
+lib/ruby/monitor.rb
+lib/ruby/mutex_m.rb
+lib/ruby/observer.rb
+lib/ruby/open3.rb
+lib/ruby/ostruct.rb
+lib/ruby/parsearg.rb
+lib/ruby/parsedate.rb
+lib/ruby/ping.rb
+lib/ruby/pstore.rb
+lib/ruby/rational.rb
+lib/ruby/readbytes.rb
+lib/ruby/shell.rb
+lib/ruby/shellwords.rb
+lib/ruby/singleton.rb
+lib/ruby/sync.rb
+lib/ruby/telnet.rb
+lib/ruby/tempfile.rb
+lib/ruby/thread.rb
+lib/ruby/thwait.rb
+lib/ruby/timeout.rb
+lib/ruby/tracer.rb
+lib/ruby/weakref.rb
+@dirrm lib/ruby/i386-netbsd
+@dirrm lib/ruby
View
26 netbsd/pkgsrc/www/apache13/Makefile
@@ -3,17 +3,17 @@
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: ache@nagual.pp.ru
#
-# $Id: Makefile,v 1.1.1.1 1999/08/08 23:59:35 itojun Exp $
+# $Id: Makefile,v 1.1.1.2 1999/08/10 09:14:59 itojun Exp $
#
-DISTNAME= apache_1.3.3
-PKGNAME= apache-1.3.3
+DISTNAME= apache_1.3.6
+PKGNAME= apache-1.3.6
CATEGORIES= www
-MASTER_SITES= ftp://www.apache.org/apache/dist/
+MASTER_SITES= ftp://www.apache.org/dist/
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
- ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/
-PATCHFILES= apache-133-v6-981224.diff.gz
+ ftp://ftp.v6.kame.net/pub/kame/misc/
+PATCHFILES= apache-136-v6-19990724.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= itojun@kame.net
@@ -22,9 +22,11 @@ MAINTAINER= itojun@kame.net
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
-GNU_CONFIGURE= yes
-CONFIGURE_SCRIPT= configure.kame-v6
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT= configure.v6
CONFIGURE_ARGS= \
+ --prefix=${PREFIX} \
+ --sbindir=${PREFIX}/sbin \
--sysconfdir=${PREFIX}/etc/apache \
--includedir=${PREFIX}/include/apache \
--logfiledir=/var/log \
@@ -52,8 +54,8 @@ CFLAGS+= -O6 -fomit-frame-pointer
CONFIGURE_ENV= OPTIM='${OPTIM}'
-MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
-MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN1= htdigest.1 htpasswd.1
+MAN8= apachectl.8 ab.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
post-patch:
chmod +x ${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -62,8 +64,8 @@ post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
- ${ECHO} "[ -x /usr/local/sbin/apachectl ] && /usr/local/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+ ${ECHO} "[ -x ${PREFIX}/bin/apachectl ] && ${PREFIX}/bin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
View
6 netbsd/pkgsrc/www/apache13/files/md5
@@ -1,2 +1,4 @@
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
-MD5 (apache-133-v6-981224.diff.gz) = bed47f0693365c9537eac8b9b744e7dc
+$NetBSD$
+
+MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache-136-v6-19990724.diff.gz) = cab405b60a916219f90bd048a2078616
View
64 netbsd/pkgsrc/www/apache13/patches/patch-aa
@@ -1,40 +1,24 @@
-*** configure.orig Thu Sep 17 12:07:53 1998
---- configure Thu Sep 24 03:57:33 1998
-***************
-*** 870,877 ****
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
- echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
-! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
-! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
- echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
- echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
---- 870,877 ----
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
- echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
-! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
- echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
- echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-***************
-*** 935,942 ****
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
-! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
-! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
---- 935,942 ----
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
-! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
+--- configure.orig Sat Jan 2 05:19:41 1999
++++ configure Tue Jan 12 06:02:12 1999
+@@ -1012,8 +1012,8 @@
+ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+ echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+ echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
+- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
+- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
++ echo " DEFAULT_XFERLOG: ${logfiledir_relative}http-access_log"
++ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}http-error_log"
+ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
+ echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+@@ -1091,8 +1091,8 @@
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}http-access_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}http-error_log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
View
240 netbsd/pkgsrc/www/apache13/patches/patch-ab
@@ -1,152 +1,88 @@
-*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998
---- Makefile.tmpl Thu Sep 24 04:07:49 1998
-***************
-*** 107,112 ****
---- 107,113 ----
- runtimedir = @runtimedir@
- logfiledir = @logfiledir@
- proxycachedir = @proxycachedir@
-+ doc_prefix = $(prefix)/share/doc/apache
-
- libexecdir_relative = @libexecdir_relative@
-
-***************
-*** 167,173 ****
- -DGID_MIN=$(suexec_gidmin) \
- -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
- -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
-! -DDOC_ROOT=\"$(datadir)/htdocs\" \
- -DSAFE_PATH=\"$(suexec_safepath)\" \
- ' \
- suexec; \
---- 168,174 ----
- -DGID_MIN=$(suexec_gidmin) \
- -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
- -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
-! -DDOC_ROOT=\"$(datadir)/data\" \
- -DSAFE_PATH=\"$(suexec_safepath)\" \
- ' \
- suexec; \
-***************
-*** 224,232 ****
- $(MKDIR) $(root)$(mandir)/man1
- $(MKDIR) $(root)$(mandir)/man8
- $(MKDIR) $(root)$(sysconfdir)
-! $(MKDIR) $(root)$(datadir)/htdocs
- $(MKDIR) $(root)$(datadir)/icons
-! $(MKDIR) $(root)$(datadir)/cgi-bin
- $(MKDIR) $(root)$(includedir)
- $(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
---- 225,233 ----
- $(MKDIR) $(root)$(mandir)/man1
- $(MKDIR) $(root)$(mandir)/man8
- $(MKDIR) $(root)$(sysconfdir)
-! $(MKDIR) $(root)$(doc_prefix)
- $(MKDIR) $(root)$(datadir)/icons
-! $(MKDIR) $(root)$(datadir)/cgi-bin.default
- $(MKDIR) $(root)$(includedir)
- $(MKDIR) $(root)$(runtimedir)
- $(MKDIR) $(root)$(logfiledir)
-***************
-*** 340,365 ****
- # icons and distributed CGI scripts.
- install-data:
- @echo "===> [data: Installing initial data files]"
-! -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
-! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
-! else \
-! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
- (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
-! find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
-! find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
-! fi
-! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
-! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
-! else \
- for script in printenv test-cgi; do \
- cat $(TOP)/cgi-bin/$${script} |\
- sed -e 's;^#!/.*perl;#!$(PERL);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp; \
-! echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
-! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
- done; \
-! fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
- (cd $(TOP)/icons/ && $(TAR) cf - *) |\
- (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
---- 341,373 ----
- # icons and distributed CGI scripts.
- install-data:
- @echo "===> [data: Installing initial data files]"
-! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
-! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
-! # else \
-! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
-! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
-! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-! # fi
-! if [ ! -d $(root)$(datadir)/data ]; then \
-! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
-! fi
-! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
-! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
-! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
-! # else \
- for script in printenv test-cgi; do \
- cat $(TOP)/cgi-bin/$${script} |\
- sed -e 's;^#!/.*perl;#!$(PERL);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp; \
-! echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \
-! $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
- done; \
-! # fi
-! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
-! $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
-! fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
- (cd $(TOP)/icons/ && $(TAR) cf - *) |\
- (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
-***************
-*** 378,384 ****
- echo ""; \
- cat $(TOP)/conf/$${conf}-dist ) |\
- sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
- -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
---- 386,392 ----
- echo ""; \
- cat $(TOP)/conf/$${conf}-dist ) |\
- sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-! -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
- -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
-***************
-*** 386,395 ****
- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
- -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
-! -e 's;logs/access_log;$(logfiledir)/access_log;' \
-! -e 's;logs/error_log;$(logfiledir)/error_log;' \
-! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
-! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
- -e 's;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
- -e 's;Group #-1;Group $(conf_group);' \
---- 394,403 ----
- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
- -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
-! -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \
-! -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \
-! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
-! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
- -e 's;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
- -e 's;Group #-1;Group $(conf_group);' \
+--- Makefile.tmpl.orig Tue Mar 16 09:38:46 1999
++++ Makefile.tmpl Fri Mar 26 02:53:06 1999
+@@ -113,13 +113,14 @@
+ sysconfdir = @sysconfdir@
+ datadir = @datadir@
+ iconsdir = $(datadir)/icons
+-htdocsdir = $(datadir)/htdocs
+-cgidir = $(datadir)/cgi-bin
++htdocsdir = $(datadir)/data
++cgidir = $(datadir)/cgi-bin.default
+ includedir = @includedir@
+ localstatedir = @localstatedir@
+ runtimedir = @runtimedir@
+ logfiledir = @logfiledir@
+ proxycachedir = @proxycachedir@
++doc_prefix = $(prefix)/share/doc/apache
+
+ libexecdir_relative = @libexecdir_relative@
+
+@@ -249,7 +250,7 @@
+ $(MKDIR) $(root)$(mandir)/man1
+ $(MKDIR) $(root)$(mandir)/man8
+ $(MKDIR) $(root)$(sysconfdir)
+- $(MKDIR) $(root)$(htdocsdir)
++ $(MKDIR) $(root)$(doc_prefix)
+ $(MKDIR) $(root)$(iconsdir)
+ $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(includedir)
+@@ -379,18 +380,22 @@
+ # icons and distributed CGI scripts.
+ install-data:
+ @echo "===> [data: Installing initial data files]"
+- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
+- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+- else \
+- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
++# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
++# else \
++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
+ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
++ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
++ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
++ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
++# fi
++ if [ ! -d $(root)$(datadir)/data ]; then \
++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
+ fi
+- -@if [ -f $(root)$(cgidir)/printenv ]; then \
+- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+- else \
++ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
++# -@if [ -f $(root)$(cgidir)/printenv ]; then \
++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++# else \
+ for script in printenv test-cgi; do \
+ cat $(TOP)/cgi-bin/$${script} |\
+ sed -e 's;^#!/.*perl;#!$(PERL);' \
+@@ -398,7 +403,10 @@
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+ done; \
+- fi
++# fi
++ if [ ! -d $(root)$(cgidir) ]; then \
++ $(LN) -sf $(root)$(cgidir) $(root)$(datadir)/cgi-bin; \
++ fi
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+@@ -436,10 +444,10 @@
+ -e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
+- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
+- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
+- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
+- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
++ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access_log;" \
++ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error_log;" \
++ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer_log;" \
++ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent_log;" \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
+ -e 's;Group #-1;Group $(conf_group);' \
View
68 netbsd/pkgsrc/www/apache13/patches/patch-ak
@@ -1,40 +1,28 @@
-*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998
---- src/support/apachectl Fri Jul 24 00:34:59 1998
-***************
-*** 39,44 ****
---- 39,46 ----
- # -------------------- --------------------
- # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-
-+ eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then
-***************
-*** 50,56 ****
- # check for pidfile
- if [ -f $PIDFILE ] ; then
- PID=`cat $PIDFILE`
-! if kill -0 $PID; then
- STATUS="httpd (pid $PID) running"
- RUNNING=1
- else
---- 52,58 ----
- # check for pidfile
- if [ -f $PIDFILE ] ; then
- PID=`cat $PIDFILE`
-! if kill -0 $PID > /dev/null 2>&1; then
- STATUS="httpd (pid $PID) running"
- RUNNING=1
- else
-***************
-*** 82,87 ****
---- 84,90 ----
- fi
- if kill $PID ; then
- echo "$0 $ARG: httpd stopped"
-+ rm $PIDFILE
- else
- echo "$0 $ARG: httpd could not be stopped"
- ERROR=4
+--- src/support/apachectl.orig Wed Feb 10 03:00:34 1999
++++ src/support/apachectl Fri Mar 26 02:38:11 1999
+@@ -39,6 +39,8 @@
+ # -------------------- --------------------
+ # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+
++#eval `limits -e -C daemon` >/dev/null 2>&1
++
+ ERROR=0
+ ARGV="$@"
+ if [ "x$ARGV" = "x" ] ; then
+@@ -50,7 +52,7 @@
+ # check for pidfile
+ if [ -f $PIDFILE ] ; then
+ PID=`cat $PIDFILE`
+- if [ ! "x$PID" = "x" ] && kill -0 $PID; then
++ if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then
+ STATUS="httpd (pid $PID) running"
+ RUNNING=1
+ else
+@@ -82,6 +84,7 @@
+ fi
+ if kill $PID ; then
+ echo "$0 $ARG: httpd stopped"
++ rm $PIDFILE
+ else
+ echo "$0 $ARG: httpd could not be stopped"
+ ERROR=4
View
45 netbsd/pkgsrc/www/apache13/pkg/PLIST
@@ -32,6 +32,7 @@ include/apache/http_vhost.h
include/apache/httpd.h
include/apache/multithread.h
include/apache/os.h
+include/apache/os-inline.c
include/apache/rfc1413.h
include/apache/scoreboard.h
include/apache/util_date.h
@@ -82,6 +83,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig
share/doc/apache/manual/images/mod_rewrite_fig2.gif
share/doc/apache/manual/images/sub.gif
share/doc/apache/manual/index.html
+share/doc/apache/manual/install-tpf.html
share/doc/apache/manual/install.html
share/doc/apache/manual/invoking.html
share/doc/apache/manual/keepalive.html
@@ -163,10 +165,13 @@ share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
share/doc/apache/manual/new_features_1_3.html
share/doc/apache/manual/process-model.html
+share/doc/apache/manual/readme-tpf.html
+share/doc/apache/manual/search/manual-index.cgi
share/doc/apache/manual/sections.html
share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html
share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
share/doc/apache/manual/unixware.html
share/doc/apache/manual/upgrading_to_1_3.html
share/doc/apache/manual/vhosts/details.html
@@ -178,6 +183,7 @@ share/doc/apache/manual/vhosts/header.html
share/doc/apache/manual/vhosts/host.html
share/doc/apache/manual/vhosts/index.html
share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/mass.html
share/doc/apache/manual/vhosts/name-based.html
share/doc/apache/manual/vhosts/vhosts-in-depth.html
share/doc/apache/manual/vhosts/virtual-host.html
@@ -246,6 +252,39 @@ www/icons/right.gif
www/icons/screw1.gif
www/icons/screw2.gif
www/icons/script.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/doc.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/patch.gif
+www/icons/small/ps.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
www/icons/sound1.gif
www/icons/sound2.gif
www/icons/sphere1.gif
@@ -260,11 +299,9 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
-man/man1/ab.1.gz
-man/man1/apachectl.1.gz
-man/man1/dbmmanage.1.gz
man/man1/htdigest.1.gz
man/man1/htpasswd.1.gz
+man/man8/apachectl.8.gz
man/man8/apxs.8.gz
man/man8/httpd.8.gz
man/man8/logresolve.8.gz
@@ -276,10 +313,12 @@ man/man8/rotatelogs.8.gz
@dirrm share/doc/apache/manual/images
@dirrm share/doc/apache/manual/misc
@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/search
@dirrm share/doc/apache/manual/vhosts
@dirrm share/doc/apache/manual
@dirrm share/doc/apache
@dirrm www/cgi-bin.default
+@dirrm www/icons/small
@dirrm www/icons
@dirrm www/proxy
@dirrm www
Please sign in to comment.
Something went wrong with that request. Please try again.