pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Mon Jan 1 10:23:09 UTC 2018
Modified Files:
pkgsrc/meta-pkgs/bulk-small: Makefile
pkgsrc/misc/php-orangehrm: MESSAGE
pkgsrc/mk: apache.mk
pkgsrc/mk/defaults: mk.conf options.description
pkgsrc/mk/pbulk: pbulk-index.mk
pkgsrc/net/netdisco: Makefile
pkgsrc/pkgtools/pkglint/files: vardefs.go
pkgsrc/pkgtools/pkglint4/files: makevars.map
pkgsrc/security: Makefile
pkgsrc/security/ap-modsecurity2: Makefile
pkgsrc/www: Makefile
pkgsrc/www/ap-auth-kerb: Makefile
pkgsrc/www/ap-auth-mellon: Makefile
pkgsrc/www/ap-authnz-crowd: Makefile
pkgsrc/www/ap2-auth-mellon: Makefile
pkgsrc/www/ap2-encoding: Makefile
pkgsrc/www/ap2-fcgid: Makefile
pkgsrc/www/ap2-jk: Makefile
pkgsrc/www/ap2-mkdir: Makefile
pkgsrc/www/ap2-perl: Makefile
pkgsrc/www/ap2-python: Makefile
pkgsrc/www/ap2-subversion: Makefile
pkgsrc/www/ap2-upload: Makefile
pkgsrc/www/ap2-xsendfile: Makefile
pkgsrc/www/ap22-auth-ofba: Makefile
pkgsrc/www/ap22-authz-ldap: Makefile
pkgsrc/www/gitweb: Makefile
pkgsrc/www/matcha-sns: MESSAGE
pkgsrc/www/php-basercms: MESSAGE
pkgsrc/www/php-tiki6: MESSAGE
pkgsrc/www/py-mod_wsgi: Makefile
Removed Files:
pkgsrc/security/otptool: DESCR Makefile PLIST distinfo
pkgsrc/security/otptool/patches: patch-configure
pkgsrc/www/ap-auth-mysql: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap-auth-mysql/patches: patch-DIRECTIVES patch-USAGE patch-aa
patch-ab patch-ac patch-ad patch-ae
pkgsrc/www/ap-fastcgi: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap-fastcgi/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae
pkgsrc/www/ap-geoip2: DESCR Makefile PLIST distinfo
pkgsrc/www/ap-scgi: DESCR MESSAGE Makefile PLIST
pkgsrc/www/ap2-auth-external: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-auth-external/patches: patch-aa
pkgsrc/www/ap2-auth-mysql: DESCR Makefile PLIST distinfo
pkgsrc/www/ap2-auth-mysql/patches: patch-aa
pkgsrc/www/ap2-auth-ntlm: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-auth-ntlm/patches: patch-mod_ntlm.c patch-ntlmssp.inc.c
patch-smbencrypt.inc.c patch-smblib.inc.c
pkgsrc/www/ap2-auth-pgsql: DESCR Makefile PLIST distinfo
pkgsrc/www/ap2-auth-radius: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-auth-xradius: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-auth-xradius/patches: patch-aa patch-ab patch-ac
pkgsrc/www/ap2-authn-otp: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-bw: DESCR Makefile PLIST distinfo
pkgsrc/www/ap2-cband: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-suphp: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap2-suphp/patches: patch-src_IniSection.cpp
patch-src_IniSection.hpp patch-src_SmartPtr.hpp
pkgsrc/www/ap2-transform: DESCR Makefile PLIST distinfo
pkgsrc/www/ap2-transform/patches: patch-src_Makefile.in
pkgsrc/www/ap22-authn-sasl: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap22-authnz-external: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/www/ap22-authnz-external/patches: patch-aa
pkgsrc/www/ap22-limitipconn: DESCR Makefile PLIST distinfo
pkgsrc/www/ap22-vhost-ldap: DESCR MESSAGE Makefile PLIST distinfo
Log Message:
apache22: remove, it was eol'd in June 2017
Remove packages that only work with apache22.
Remove apache22 references.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/php-orangehrm/MESSAGE
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/apache.mk
cvs rdiff -u -r1.288 -r1.289 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.548 -r1.549 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mk/pbulk/pbulk-index.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/netdisco/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.663 -r1.664 pkgsrc/security/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/ap-modsecurity2/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/security/otptool/DESCR \
pkgsrc/security/otptool/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/security/otptool/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/security/otptool/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/security/otptool/patches/patch-configure
cvs rdiff -u -r1.1294 -r1.1295 pkgsrc/www/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/ap-auth-kerb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap-auth-mellon/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap-auth-mysql/DESCR \
pkgsrc/www/ap-auth-mysql/MESSAGE
cvs rdiff -u -r1.31 -r0 pkgsrc/www/ap-auth-mysql/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap-auth-mysql/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/www/ap-auth-mysql/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap-auth-mysql/patches/patch-DIRECTIVES \
pkgsrc/www/ap-auth-mysql/patches/patch-USAGE \
pkgsrc/www/ap-auth-mysql/patches/patch-ae
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap-auth-mysql/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap-auth-mysql/patches/patch-ab \
pkgsrc/www/ap-auth-mysql/patches/patch-ac
cvs rdiff -u -r1.5 -r0 pkgsrc/www/ap-auth-mysql/patches/patch-ad
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/ap-authnz-crowd/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap-fastcgi/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap-fastcgi/MESSAGE
cvs rdiff -u -r1.34 -r0 pkgsrc/www/ap-fastcgi/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap-fastcgi/PLIST
cvs rdiff -u -r1.8 -r0 pkgsrc/www/ap-fastcgi/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap-fastcgi/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap-fastcgi/patches/patch-ab \
pkgsrc/www/ap-fastcgi/patches/patch-ac \
pkgsrc/www/ap-fastcgi/patches/patch-ad \
pkgsrc/www/ap-fastcgi/patches/patch-ae
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap-geoip2/DESCR \
pkgsrc/www/ap-geoip2/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/www/ap-geoip2/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap-geoip2/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap-scgi/DESCR \
pkgsrc/www/ap-scgi/MESSAGE pkgsrc/www/ap-scgi/PLIST
cvs rdiff -u -r1.18 -r0 pkgsrc/www/ap-scgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-external/DESCR \
pkgsrc/www/ap2-auth-external/MESSAGE pkgsrc/www/ap2-auth-external/PLIST
cvs rdiff -u -r1.8 -r0 pkgsrc/www/ap2-auth-external/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-external/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-external/patches/patch-aa
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/ap2-auth-mellon/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-mysql/DESCR
cvs rdiff -u -r1.25 -r0 pkgsrc/www/ap2-auth-mysql/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-mysql/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/www/ap2-auth-mysql/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap2-auth-mysql/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-ntlm/DESCR \
pkgsrc/www/ap2-auth-ntlm/MESSAGE
cvs rdiff -u -r1.7 -r0 pkgsrc/www/ap2-auth-ntlm/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-ntlm/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap2-auth-ntlm/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c \
pkgsrc/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c \
pkgsrc/www/ap2-auth-ntlm/patches/patch-smblib.inc.c
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-pgsql/DESCR
cvs rdiff -u -r1.27 -r0 pkgsrc/www/ap2-auth-pgsql/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap2-auth-pgsql/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap2-auth-pgsql/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-auth-radius/DESCR \
pkgsrc/www/ap2-auth-radius/PLIST pkgsrc/www/ap2-auth-radius/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-radius/MESSAGE
cvs rdiff -u -r1.16 -r0 pkgsrc/www/ap2-auth-radius/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-xradius/DESCR \
pkgsrc/www/ap2-auth-xradius/MESSAGE pkgsrc/www/ap2-auth-xradius/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/www/ap2-auth-xradius/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap2-auth-xradius/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-auth-xradius/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap2-auth-xradius/patches/patch-ab \
pkgsrc/www/ap2-auth-xradius/patches/patch-ac
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-authn-otp/DESCR \
pkgsrc/www/ap2-authn-otp/MESSAGE pkgsrc/www/ap2-authn-otp/PLIST
cvs rdiff -u -r1.10 -r0 pkgsrc/www/ap2-authn-otp/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap2-authn-otp/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-bw/DESCR pkgsrc/www/ap2-bw/PLIST
cvs rdiff -u -r1.12 -r0 pkgsrc/www/ap2-bw/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-bw/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-cband/DESCR \
pkgsrc/www/ap2-cband/MESSAGE pkgsrc/www/ap2-cband/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/www/ap2-cband/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-cband/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ap2-encoding/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ap2-fcgid/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/ap2-jk/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ap2-mkdir/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/ap2-perl/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/ap2-python/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/ap2-subversion/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-suphp/DESCR
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap2-suphp/MESSAGE
cvs rdiff -u -r1.20 -r0 pkgsrc/www/ap2-suphp/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap2-suphp/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/www/ap2-suphp/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap2-suphp/patches/patch-src_IniSection.cpp \
pkgsrc/www/ap2-suphp/patches/patch-src_IniSection.hpp \
pkgsrc/www/ap2-suphp/patches/patch-src_SmartPtr.hpp
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-transform/DESCR
cvs rdiff -u -r1.20 -r0 pkgsrc/www/ap2-transform/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap2-transform/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap2-transform/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ap2-transform/patches/patch-src_Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ap2-upload/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/ap2-xsendfile/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ap22-auth-ofba/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap22-authn-sasl/DESCR \
pkgsrc/www/ap22-authn-sasl/MESSAGE pkgsrc/www/ap22-authn-sasl/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/www/ap22-authn-sasl/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap22-authn-sasl/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap22-authnz-external/DESCR \
pkgsrc/www/ap22-authnz-external/MESSAGE
cvs rdiff -u -r1.8 -r0 pkgsrc/www/ap22-authnz-external/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/ap22-authnz-external/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ap22-authnz-external/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap22-authnz-external/patches/patch-aa
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/ap22-authz-ldap/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap22-limitipconn/DESCR \
pkgsrc/www/ap22-limitipconn/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/www/ap22-limitipconn/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap22-limitipconn/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ap22-vhost-ldap/DESCR \
pkgsrc/www/ap22-vhost-ldap/MESSAGE
cvs rdiff -u -r1.10 -r0 pkgsrc/www/ap22-vhost-ldap/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap22-vhost-ldap/PLIST \
pkgsrc/www/ap22-vhost-ldap/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/gitweb/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/matcha-sns/MESSAGE
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/php-basercms/MESSAGE
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/php-tiki6/MESSAGE
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/py-mod_wsgi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.20 pkgsrc/meta-pkgs/bulk-small/Makefile:1.21
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.20 Fri Sep 29 12:40:28 2017
+++ pkgsrc/meta-pkgs/bulk-small/Makefile Mon Jan 1 10:23:04 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/01/01 10:23:04 wiz Exp $
-DISTNAME= bulk-small-20170929
+DISTNAME= bulk-small-20180101
CATEGORIES= meta-pkgs
MASTER_SITES= # empty
DISTFILES= # empty
@@ -155,8 +155,6 @@ BUILD_DEPENDS+= xmlcatmgr-[0-9]*:../../t
# take somewhat longer.
#
BUILD_DEPENDS+= lzo-[0-9]*:../../archivers/lzo # required by gnutls
-BUILD_DEPENDS+= apr-[0-9]*:../../devel/apr # required by apache22
-BUILD_DEPENDS+= apr-util-[0-9]*:../../devel/apr-util # required by apache22
BUILD_DEPENDS+= gmp-[0-9]*:../../devel/gmp # required by nettle
BUILD_DEPENDS+= libcfg+-[0-9]*:../../devel/libcfg+ # required by gnutls
BUILD_DEPENDS+= libffi-[0-9]*:../../devel/libffi # required by python
Index: pkgsrc/misc/php-orangehrm/MESSAGE
diff -u pkgsrc/misc/php-orangehrm/MESSAGE:1.2 pkgsrc/misc/php-orangehrm/MESSAGE:1.3
--- pkgsrc/misc/php-orangehrm/MESSAGE:1.2 Fri May 11 10:41:26 2012
+++ pkgsrc/misc/php-orangehrm/MESSAGE Mon Jan 1 10:23:04 2018
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2012/05/11 10:41:26 ryoon Exp $
+$NetBSD: MESSAGE,v 1.3 2018/01/01 10:23:04 wiz Exp $
To use OrangeHRM, you will need to perform the following steps.
@@ -7,7 +7,7 @@ To use OrangeHRM, you will need to perfo
# ${RCD_SCRIPTS_DIR}/mysqld start
-2. Install apache httpd server, for example www/apache22 and www/ap-php.
+2. Install apache httpd server, for example www/apache24 and www/ap-php.
3. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
Index: pkgsrc/mk/apache.mk
diff -u pkgsrc/mk/apache.mk:1.30 pkgsrc/mk/apache.mk:1.31
--- pkgsrc/mk/apache.mk:1.30 Sat Mar 11 18:29:24 2017
+++ pkgsrc/mk/apache.mk Mon Jan 1 10:23:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.30 2017/03/11 18:29:24 maya Exp $
+# $NetBSD: apache.mk,v 1.31 2018/01/01 10:23:09 wiz Exp $
#
# This file is meant to be included by packages that require an apache
# web server.
@@ -9,7 +9,7 @@
# The default apache server to use and install. If there already
# is an apache installed, this will have no effect.
#
-# Possible values: apache22 apache24
+# Possible values: apache24
#
# Package-settable variables:
#
@@ -55,11 +55,7 @@ PKG_APACHE_ACCEPTED?= ${_PKG_APACHES}
USE_APR?= no
# The available apache packages:
-_PKG_APACHES= apache22 apache24
-
-_APACHE_PKGBASE.apache22= apache-2.[23]*
-_APACHE_PKG_PREFIX.apache22= ap22
-_APACHE_PKGSRCDIR.apache22= ../../www/apache22
+_PKG_APACHES= apache24
_APACHE_PKGBASE.apache24= apache-2.[456789]*
_APACHE_PKG_PREFIX.apache24= ap24
@@ -72,7 +68,7 @@ _APACHE_PKGSRCDIR.apache24= ../../www/ap
.if empty(_PKG_APACHES:M${PKG_APACHE_DEFAULT})
_PKG_APACHE_MESSAGE:= "[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT."
PKG_FAIL_REASON+= ${_PKG_APACHE_MESSAGE}
-PKG_APACHE_DEFAULT= apache22
+PKG_APACHE_DEFAULT= apache24
.endif
.for _ap_ in ${PKG_APACHE_ACCEPTED}
Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.288 pkgsrc/mk/defaults/mk.conf:1.289
--- pkgsrc/mk/defaults/mk.conf:1.288 Sun Dec 3 11:09:46 2017
+++ pkgsrc/mk/defaults/mk.conf Mon Jan 1 10:23:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.288 2017/12/03 11:09:46 wiz Exp $
+# $NetBSD: mk.conf,v 1.289 2018/01/01 10:23:09 wiz Exp $
#
# This file provides default values for variables that may be overridden
@@ -716,27 +716,27 @@ AMANDA_VAR?= ${VARBASE}/amanda
# Default: ${VARBASE}/amanda
APACHE_USER?= www
-# Used in apache22, apache24, isap, and smb2www to specify the user
+# Used in apache24, isap, and smb2www to specify the user
# allowed to execute the `suexec' wrapper. Expected to be the user the
# httpd server normally runs as.
# Possible: any user name
# Default: www
APACHE_GROUP?= www
-# Used in apache22, apache24, squirrelmail, and iasp to specify
+# Used in apache24, squirrelmail, and iasp to specify
# the default group of the user allowed to execute the `suexec' wrapper.
# Expected to be the group the httpd server normally runs as.
# Possible: any group name
# Default: www
#APACHE_SUEXEC_CONFIGURE_ARGS= --suexec-uidmin=1000
-# Used in apache22 and apache24 to specify additional suexec options
+# Used in apache24 to specify additional suexec options
# to be passed to the configure script.
# Possible: any --suexec-* options recognized by the Apache configure script.
# Default: not defined
APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs
-# Used in apache22 and apache24 to specify the document space in
+# Used in apache24 to specify the document space in
# which suexec will be allowed to work.
# Possible: Any valid directory
# Default: ${LOCALBASE}/share/httpd/htdocs
Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.548 pkgsrc/mk/defaults/options.description:1.549
--- pkgsrc/mk/defaults/options.description:1.548 Sat Dec 23 21:12:13 2017
+++ pkgsrc/mk/defaults/options.description Mon Jan 1 10:23:09 2018
@@ -30,7 +30,6 @@ apache Enable support for Apache web s
apache-mpm-event Use multi-threaded workers in Apache web server.
apache-mpm-prefork Use pre-forked workers in Apache web server.
apache-mpm-worker Use multiple processes of multi-threaded workers in Apache web server.
-apache-shared-modules Build all modules as shared for apache22.
apple-common-crypto Use Apple's CommonCrypto.
ares Use the ares library for asynchronous name resolution.
aria2-metalink Enable Metalink support.
Index: pkgsrc/mk/pbulk/pbulk-index.mk
diff -u pkgsrc/mk/pbulk/pbulk-index.mk:1.23 pkgsrc/mk/pbulk/pbulk-index.mk:1.24
--- pkgsrc/mk/pbulk/pbulk-index.mk:1.23 Sat Dec 17 23:41:52 2016
+++ pkgsrc/mk/pbulk/pbulk-index.mk Mon Jan 1 10:23:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: pbulk-index.mk,v 1.23 2016/12/17 23:41:52 joerg Exp $
+# $NetBSD: pbulk-index.mk,v 1.24 2018/01/01 10:23:09 wiz Exp $
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to the parallel bulk build
@@ -78,12 +78,7 @@ pbulk-index: pbulk-index-item
# Use an ODE for loop to compute the carthesian product of
# the support settings. This expands to something like
#
-# for apache in apache22 apache24; do \
-# _PBULK_MULTI_VALUE.apache=$apache; \
-# export _PBULK_MULTI_VALUE.apache; \
-# PKG_APACHE=$apache; \
-# export PKG_APACHE; \
-# for php in 4 5; do \
+# for php in 4 5; do \
# _PBULK_MULTI_VALUE.php=$php; \
# export _PBULK_MULTI_VALUE.php; \
# PHP_VERSION_REQD=$php; \
Index: pkgsrc/net/netdisco/Makefile
diff -u pkgsrc/net/netdisco/Makefile:1.41 pkgsrc/net/netdisco/Makefile:1.42
--- pkgsrc/net/netdisco/Makefile:1.41 Sun Mar 12 07:20:51 2017
+++ pkgsrc/net/netdisco/Makefile Mon Jan 1 10:23:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/03/12 07:20:51 maya Exp $
+# $NetBSD: Makefile,v 1.42 2018/01/01 10:23:04 wiz Exp $
DISTNAME= netdisco-${PKGVERSION}_with_mibs
PKGNAME= netdisco-${PKGVERSION}
@@ -122,14 +122,12 @@ RCD_SCRIPT_SRC.netdisco= ${WRKSRC:Q}/bin
.include "../../mk/apache.mk"
-.if ${PKG_APACHE} != "apache22"
SUBST_STAGE.apachevers= pre-configure
SUBST_FILES.apachevers= html/admin_user.html html/change_pw.html html/login.html
SUBST_FILES.apachevers+= html/logout.html html/portcontrol.html
SUBST_FILES.apachevers+= html/public_debugging.html
SUBST_SED.apachevers= -e "s|connection->remote_ip|connection->client_ip|g"
SUBST_MESSAGE.apachevers= Fixing perl files for apache > 2.2.
-.endif
do-build:
${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt
Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.30 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.31
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.30 Sun Oct 8 22:31:13 2017
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go Mon Jan 1 10:23:04 2018
@@ -780,9 +780,9 @@ func (gd *GlobalData) InitVartypes() {
sys("PKGVERSION", lkNone, BtVersion)
sys("PKGWILDCARD", lkNone, BtFilemask)
sys("PKG_ADMIN", lkNone, BtShellCommand)
- sys("PKG_APACHE", lkNone, enum("apache22 apache24"))
- pkg("PKG_APACHE_ACCEPTED", lkShell, enum("apache22 apache24"))
- usr("PKG_APACHE_DEFAULT", lkNone, enum("apache22 apache24"))
+ sys("PKG_APACHE", lkNone, enum("apache24"))
+ pkg("PKG_APACHE_ACCEPTED", lkShell, enum("apache24"))
+ usr("PKG_APACHE_DEFAULT", lkNone, enum("apache24"))
usr("PKG_CONFIG", lkNone, BtYes)
// ^^ No, this is not the popular command from GNOME, but the setting
// whether the pkgsrc user wants configuration files automatically
Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.7 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.8
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.7 Fri Sep 29 12:40:28 2017
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Mon Jan 1 10:23:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.7 2017/09/29 12:40:28 wiz Exp $
+# $NetBSD: makevars.map,v 1.8 2018/01/01 10:23:04 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -568,9 +568,9 @@ PKGTOOLS_ENV List of ShellWord
PKGVERSION Version [$system]
PKGWILDCARD Filemask [$system]
PKG_ADMIN ShellCommand [$system]
-PKG_APACHE { apache22 apache24 } [$system]
-PKG_APACHE_ACCEPTED List of { apache22 apache24 } [$package]
-PKG_APACHE_DEFAULT { apache22 apache24 } [$user]
+PKG_APACHE { apache24 } [$system]
+PKG_APACHE_ACCEPTED List of { apache24 } [$package]
+PKG_APACHE_DEFAULT { apache24 } [$user]
PKG_CONFIG Yes [$user]
# ^^ No, this is not the popular command from GNOME, but the setting
# whether the pkgsrc user wants configuration files automatically
Index: pkgsrc/security/Makefile
diff -u pkgsrc/security/Makefile:1.663 pkgsrc/security/Makefile:1.664
--- pkgsrc/security/Makefile:1.663 Thu Dec 21 07:12:39 2017
+++ pkgsrc/security/Makefile Mon Jan 1 10:23:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.663 2017/12/21 07:12:39 jnemeth Exp $
+# $NetBSD: Makefile,v 1.664 2018/01/01 10:23:04 wiz Exp $
#
COMMENT= Security tools
@@ -231,7 +231,6 @@ SUBDIR+= openvas-libraries
SUBDIR+= openvas-plugins
SUBDIR+= openvas-server
SUBDIR+= otpCalc
-SUBDIR+= otptool
SUBDIR+= p0f
SUBDIR+= p11-kit
SUBDIR+= p5-AuthCAS
Index: pkgsrc/security/ap-modsecurity2/Makefile
diff -u pkgsrc/security/ap-modsecurity2/Makefile:1.36 pkgsrc/security/ap-modsecurity2/Makefile:1.37
--- pkgsrc/security/ap-modsecurity2/Makefile:1.36 Thu Aug 24 20:03:38 2017
+++ pkgsrc/security/ap-modsecurity2/Makefile Mon Jan 1 10:23:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/08/24 20:03:38 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/01 10:23:04 wiz Exp $
DISTNAME= modsecurity-apache_2.7.7
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
@@ -12,7 +12,6 @@ COMMENT= Intrusion detection and prevent
LICENSE= apache-2.0
APACHE_MODULE= yes
-PKG_APACHE_ACCEPTED= apache22 apache24
USE_APR= yes
USE_LANGUAGES= c++ c
Index: pkgsrc/www/Makefile
diff -u pkgsrc/www/Makefile:1.1294 pkgsrc/www/Makefile:1.1295
--- pkgsrc/www/Makefile:1.1294 Sat Dec 30 21:37:44 2017
+++ pkgsrc/www/Makefile Mon Jan 1 10:23:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1294 2017/12/30 21:37:44 adam Exp $
+# $NetBSD: Makefile,v 1.1295 2018/01/01 10:23:04 wiz Exp $
#
COMMENT= Packages related to the World Wide Web
@@ -15,24 +15,11 @@ SUBDIR+= amaya
SUBDIR+= analog
SUBDIR+= ap-auth-kerb
SUBDIR+= ap-auth-mellon
-SUBDIR+= ap-auth-mysql
SUBDIR+= ap-authnz-crowd
-SUBDIR+= ap-fastcgi
-SUBDIR+= ap-geoip2
SUBDIR+= ap-mono
SUBDIR+= ap-php
SUBDIR+= ap-rpaf
-SUBDIR+= ap-scgi
-SUBDIR+= ap2-auth-external
SUBDIR+= ap2-auth-mellon
-SUBDIR+= ap2-auth-mysql
-SUBDIR+= ap2-auth-ntlm
-SUBDIR+= ap2-auth-pgsql
-SUBDIR+= ap2-auth-radius
-SUBDIR+= ap2-auth-xradius
-SUBDIR+= ap2-authn-otp
-SUBDIR+= ap2-bw
-SUBDIR+= ap2-cband
SUBDIR+= ap2-encoding
SUBDIR+= ap2-fcgid
SUBDIR+= ap2-jk
@@ -41,17 +28,11 @@ SUBDIR+= ap2-mkdir
SUBDIR+= ap2-perl
SUBDIR+= ap2-python
SUBDIR+= ap2-subversion
-SUBDIR+= ap2-suphp
-SUBDIR+= ap2-transform
SUBDIR+= ap2-upload
SUBDIR+= ap2-xsendfile
SUBDIR+= ap22-auth-ofba
-SUBDIR+= ap22-authn-sasl
-SUBDIR+= ap22-authnz-external
SUBDIR+= ap22-authz-ldap
SUBDIR+= ap22-dnssd
-SUBDIR+= ap22-limitipconn
-SUBDIR+= ap22-vhost-ldap
SUBDIR+= ap24-authnz-external
SUBDIR+= apache-roller
SUBDIR+= apache-tomcat55
@@ -59,7 +40,6 @@ SUBDIR+= apache-tomcat6
SUBDIR+= apache-tomcat7
SUBDIR+= apache-tomcat8
SUBDIR+= apache-tomcat85
-SUBDIR+= apache22
SUBDIR+= apache24
SUBDIR+= apachetop
SUBDIR+= asp2php
Index: pkgsrc/www/ap-auth-kerb/Makefile
diff -u pkgsrc/www/ap-auth-kerb/Makefile:1.13 pkgsrc/www/ap-auth-kerb/Makefile:1.14
--- pkgsrc/www/ap-auth-kerb/Makefile:1.13 Mon Dec 12 14:22:04 2016
+++ pkgsrc/www/ap-auth-kerb/Makefile Mon Jan 1 10:23:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/12/12 14:22:04 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/01 10:23:05 wiz Exp $
DISTNAME= mod_auth_kerb-5.4
PKGNAME= ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
@@ -10,8 +10,6 @@ HOMEPAGE= http://modauthkerb.sourceforge
COMMENT= Module to allow Apache authentication using Kerberos
LICENSE= modified-bsd
-PKG_APACHE_ACCEPTED= apache22 apache24
-
CONFLICTS= ap-auth-kerb-[0-9]*
GNU_CONFIGURE= yes
Index: pkgsrc/www/ap-auth-mellon/Makefile
diff -u pkgsrc/www/ap-auth-mellon/Makefile:1.2 pkgsrc/www/ap-auth-mellon/Makefile:1.3
--- pkgsrc/www/ap-auth-mellon/Makefile:1.2 Thu Aug 24 20:03:41 2017
+++ pkgsrc/www/ap-auth-mellon/Makefile Mon Jan 1 10:23:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/08/24 20:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.3 2018/01/01 10:23:05 wiz Exp $
DISTNAME= mod_auth_mellon-0.13.1
PKGNAME= ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
@@ -14,8 +14,6 @@ HOMEPAGE= https://github.com/UNINETT/mod
COMMENT= Module to allow Apache authentication using a SAML 2.0 IdP
LICENSE= gnu-gpl-v2
-PKG_APACHE_ACCEPTED= apache22 apache24
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs2=${APXS}
USE_LIBTOOL= yes
Index: pkgsrc/www/ap-authnz-crowd/Makefile
diff -u pkgsrc/www/ap-authnz-crowd/Makefile:1.12 pkgsrc/www/ap-authnz-crowd/Makefile:1.13
--- pkgsrc/www/ap-authnz-crowd/Makefile:1.12 Thu Nov 30 16:45:40 2017
+++ pkgsrc/www/ap-authnz-crowd/Makefile Mon Jan 1 10:23:05 2018
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/11/30 16:45:40 adam Exp $
-#
+# $NetBSD: Makefile,v 1.13 2018/01/01 10:23:05 wiz Exp $
DISTNAME= mod_authnz_crowd-2.2.2
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/}
@@ -13,7 +12,6 @@ COMMENT= Apache module for Crowd authent
LICENSE= apache-2.0
APACHE_MODULE= yes
-PKG_APACHE_ACCEPTED= apache22 apache24
DEPENDS+= ${APACHE_PKG_PREFIX}-subversion>0:../../www/ap2-subversion
Index: pkgsrc/www/ap2-auth-mellon/Makefile
diff -u pkgsrc/www/ap2-auth-mellon/Makefile:1.40 pkgsrc/www/ap2-auth-mellon/Makefile:1.41
--- pkgsrc/www/ap2-auth-mellon/Makefile:1.40 Thu Aug 24 20:03:41 2017
+++ pkgsrc/www/ap2-auth-mellon/Makefile Mon Jan 1 10:23:06 2018
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/08/24 20:03:41 adam Exp $
-#
+# $NetBSD: Makefile,v 1.41 2018/01/01 10:23:06 wiz Exp $
DISTNAME= mod_auth_mellon-0.12.0
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g}
@@ -17,9 +16,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
APACHE_MODULE= YES
-PKG_APACHE_ACCEPTED= apache22 apache24
.include "../../mk/apache.mk"
-BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47
SUBST_CLASSES+= pthflags
SUBST_STAGE.pthflags= post-configure
Index: pkgsrc/www/ap2-encoding/Makefile
diff -u pkgsrc/www/ap2-encoding/Makefile:1.1 pkgsrc/www/ap2-encoding/Makefile:1.2
--- pkgsrc/www/ap2-encoding/Makefile:1.1 Tue Aug 30 12:34:39 2016
+++ pkgsrc/www/ap2-encoding/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/30 12:34:39 manu Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:07 wiz Exp $
DISTNAME= mod_encoding-20021209
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -10,8 +10,6 @@ HOMEPAGE= http://webdav.todo.gr.jp/
COMMENT= Non-ascii filename interoperability
#LICENSE= # Pending change from Internet Initiative Japan, Inc.
-PKG_APACHE_ACCEPTED= apache22 apache24
-
APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la
GNU_CONFIGURE= yes
Index: pkgsrc/www/ap2-fcgid/Makefile
diff -u pkgsrc/www/ap2-fcgid/Makefile:1.11 pkgsrc/www/ap2-fcgid/Makefile:1.12
--- pkgsrc/www/ap2-fcgid/Makefile:1.11 Tue Jun 10 15:22:17 2014
+++ pkgsrc/www/ap2-fcgid/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/01 10:23:07 wiz Exp $
DISTNAME= mod_fcgid-2.3.9
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -10,7 +10,6 @@ HOMEPAGE= http://httpd.apache.org/mod_fc
COMMENT= High performance alternative to mod_cgi or mod_cgid
LICENSE= apache-2.0
-PKG_APACHE_ACCEPTED= apache22 apache24
APACHE_MODULE= YES
USE_LIBTOOL= YES
Index: pkgsrc/www/ap2-jk/Makefile
diff -u pkgsrc/www/ap2-jk/Makefile:1.10 pkgsrc/www/ap2-jk/Makefile:1.11
--- pkgsrc/www/ap2-jk/Makefile:1.10 Sat Feb 28 23:47:25 2015
+++ pkgsrc/www/ap2-jk/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/28 23:47:25 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/01 10:23:07 wiz Exp $
DISTNAME= tomcat-connectors-${JK_VERSION}-src
PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
@@ -9,15 +9,13 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=tomc
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://tomcat.apache.org/connectors-doc/
COMMENT= Apache connector for accessing Jakarta Tomcat
-LICENSE= apache-2.0
+LICENSE= apache-2.0
CONFLICTS= ap-jk-[0-9]*
MAKE_PARAMS+= USE_APXS=1
MAKE_PARAMS+= WITH_APXS=${APXS}
-PKG_APACHE_ACCEPTED= apache22 apache24
-
INSTALLATION_DIRS+= lib/httpd
do-install:
Index: pkgsrc/www/ap2-mkdir/Makefile
diff -u pkgsrc/www/ap2-mkdir/Makefile:1.1 pkgsrc/www/ap2-mkdir/Makefile:1.2
--- pkgsrc/www/ap2-mkdir/Makefile:1.1 Tue Aug 30 12:47:49 2016
+++ pkgsrc/www/ap2-mkdir/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/30 12:47:49 manu Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:07 wiz Exp $
DISTNAME= mod_mkdir-0.3
EXTRACT_SUFX= .tgz
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Home directory autocreation module
LICENSE= original-bsd
-PKG_APACHE_ACCEPTED= apache22 apache24
-
APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la
DOC_DIR= share/doc/${DISTNAME:C/-.*//}
Index: pkgsrc/www/ap2-perl/Makefile
diff -u pkgsrc/www/ap2-perl/Makefile:1.54 pkgsrc/www/ap2-perl/Makefile:1.55
--- pkgsrc/www/ap2-perl/Makefile:1.54 Fri Sep 22 09:59:30 2017
+++ pkgsrc/www/ap2-perl/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/09/22 09:59:30 maya Exp $
+# $NetBSD: Makefile,v 1.55 2018/01/01 10:23:07 wiz Exp $
DISTNAME= mod_perl-2.0.10
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -13,8 +13,6 @@ LICENSE= apache-2.0
CONFLICTS= ap-perl-[0-9]* p5-Apache-Reload-[0-9]* p5-Apache-Test-[0-9]*
-PKG_APACHE_ACCEPTED= apache22 apache24
-
APACHE_MODULE= yes
PERL5_PACKLIST= auto/mod_perl2/.packlist
Index: pkgsrc/www/ap2-python/Makefile
diff -u pkgsrc/www/ap2-python/Makefile:1.34 pkgsrc/www/ap2-python/Makefile:1.35
--- pkgsrc/www/ap2-python/Makefile:1.34 Sun Jul 20 03:07:05 2014
+++ pkgsrc/www/ap2-python/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/07/20 03:07:05 obache Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/01 10:23:07 wiz Exp $
DISTNAME= mod_python-3.5.0
PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//}
@@ -12,8 +12,6 @@ HOMEPAGE= http://www.modpython.org/
COMMENT= Apache module that embeds the Python interpreter
LICENSE= apache-2.0
-PKG_APACHE_ACCEPTED= apache22 apache24
-
MAKE_JOBS_SAFE= no
APACHE_MODULE= yes
Index: pkgsrc/www/ap2-subversion/Makefile
diff -u pkgsrc/www/ap2-subversion/Makefile:1.81 pkgsrc/www/ap2-subversion/Makefile:1.82
--- pkgsrc/www/ap2-subversion/Makefile:1.81 Thu Nov 30 16:45:40 2017
+++ pkgsrc/www/ap2-subversion/Makefile Mon Jan 1 10:23:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2017/11/30 16:45:40 adam Exp $
+# $NetBSD: Makefile,v 1.82 2018/01/01 10:23:07 wiz Exp $
PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
PKGREVISION= 2
@@ -21,8 +21,6 @@ post-patch:
${RM} ${WRKSRC}/build-outputs.mk
${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
-PKG_APACHE_ACCEPTED= apache22 apache24
-
.include "../../devel/subversion-base/buildlink3.mk"
.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/ap2-upload/Makefile
diff -u pkgsrc/www/ap2-upload/Makefile:1.1 pkgsrc/www/ap2-upload/Makefile:1.2
--- pkgsrc/www/ap2-upload/Makefile:1.1 Thu Dec 21 03:47:25 2017
+++ pkgsrc/www/ap2-upload/Makefile Mon Jan 1 10:23:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/12/21 03:47:25 manu Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:08 wiz Exp $
DISTNAME= mod_upload-0.7
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -10,8 +10,6 @@ HOMEPAGE= https://ftp.espci.fr/pub/mod_u
COMMENT= High performance file upload helper for PHP
LICENSE= gnu-gpl-v2
-PKG_APACHE_ACCEPTED= apache22 apache24
-
APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la
GNU_CONFIGURE= yes
Index: pkgsrc/www/ap2-xsendfile/Makefile
diff -u pkgsrc/www/ap2-xsendfile/Makefile:1.3 pkgsrc/www/ap2-xsendfile/Makefile:1.4
--- pkgsrc/www/ap2-xsendfile/Makefile:1.3 Tue Aug 1 14:59:06 2017
+++ pkgsrc/www/ap2-xsendfile/Makefile Mon Jan 1 10:23:08 2018
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/01 14:59:06 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2018/01/01 10:23:08 wiz Exp $
DISTNAME= mod_xsendfile-0.12
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -16,8 +15,6 @@ APACHE_MODULE_NAME= ${DISTNAME:C|-.*||}.
APACHE_MODULE_SRC= ${DISTNAME:C|-.*||}.c
APACHE_MODULE_LA= ${DISTNAME:C|-.*||}.la
-PKG_APACHE_ACCEPTED= apache22 apache24
-
do-build:
cd ${WRKSRC} && ${APXS} ${CPPFLAGS} ${LDFLAGS} -c -o ${APACHE_MODULE_NAME} ${APACHE_MODULE_SRC}
Index: pkgsrc/www/ap22-auth-ofba/Makefile
diff -u pkgsrc/www/ap22-auth-ofba/Makefile:1.1 pkgsrc/www/ap22-auth-ofba/Makefile:1.2
--- pkgsrc/www/ap22-auth-ofba/Makefile:1.1 Thu Dec 21 03:50:43 2017
+++ pkgsrc/www/ap22-auth-ofba/Makefile Mon Jan 1 10:23:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/12/21 03:50:43 manu Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:08 wiz Exp $
DISTNAME= mod_auth_ofba-0.6
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g}
@@ -15,7 +15,6 @@ USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_APR= yes
-PKG_APACHE_ACCEPTED= apache22 apache24
.include "../../mk/apache.mk"
APACHE_MODULE_NAME= mod_auth_ofba.${MODULE_EXT}
Index: pkgsrc/www/ap22-authz-ldap/Makefile
diff -u pkgsrc/www/ap22-authz-ldap/Makefile:1.3 pkgsrc/www/ap22-authz-ldap/Makefile:1.4
--- pkgsrc/www/ap22-authz-ldap/Makefile:1.3 Sat Mar 5 11:29:35 2016
+++ pkgsrc/www/ap22-authz-ldap/Makefile Mon Jan 1 10:23:08 2018
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:29:35 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.4 2018/01/01 10:23:08 wiz Exp $
DISTNAME= mod_authz_ldap-0.30
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:C/^mod_//:C/_/-/}
@@ -12,8 +11,6 @@ HOMEPAGE= http://authzldap.othello.ch/
COMMENT= Apache LDAP Authorization module
LICENSE= apache-2.0
-PKG_APACHE_ACCEPTED= apache24 apache22
-
.include "../../mk/apache.mk"
.include "options.mk"
Index: pkgsrc/www/gitweb/Makefile
diff -u pkgsrc/www/gitweb/Makefile:1.34 pkgsrc/www/gitweb/Makefile:1.35
--- pkgsrc/www/gitweb/Makefile:1.34 Thu Jul 21 13:12:25 2016
+++ pkgsrc/www/gitweb/Makefile Mon Jan 1 10:23:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/07/21 13:12:25 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/01 10:23:09 wiz Exp $
.include "../../devel/git/Makefile.common"
@@ -7,7 +7,7 @@ CATEGORIES= www
COMMENT= Web interface for GIT repositories
-#DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22
+#DEPENDS+= apache-[0-9]*:../../www/apache24
DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base
#DEPENDS+= {perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes
DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI
Index: pkgsrc/www/matcha-sns/MESSAGE
diff -u pkgsrc/www/matcha-sns/MESSAGE:1.1 pkgsrc/www/matcha-sns/MESSAGE:1.2
--- pkgsrc/www/matcha-sns/MESSAGE:1.1 Wed Apr 8 19:11:09 2015
+++ pkgsrc/www/matcha-sns/MESSAGE Mon Jan 1 10:23:09 2018
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/04/08 19:11:09 ryoon Exp $
+$NetBSD: MESSAGE,v 1.2 2018/01/01 10:23:09 wiz Exp $
To use Matcha SNS with Apache httpd 2.2, you will need to perform
the following steps.
-1. Install www/apache22 and www/ap-php .
+1. Install www/apache24 and www/ap-php .
2. Setup PHP. At least, ${PREFIX}/etc/php.ini should have date.timezone line.
If your machine are located in Tokyo, Japan, you should get the following.
@@ -58,7 +58,7 @@ the following steps.
Require all granted
</Directory>
-9. Start Apache httpd 2.2
+9. Start Apache httpd
# ${RCD_SCRIPTS_DIR}/apache start
Index: pkgsrc/www/php-basercms/MESSAGE
diff -u pkgsrc/www/php-basercms/MESSAGE:1.2 pkgsrc/www/php-basercms/MESSAGE:1.3
--- pkgsrc/www/php-basercms/MESSAGE:1.2 Sat Nov 29 12:26:16 2014
+++ pkgsrc/www/php-basercms/MESSAGE Mon Jan 1 10:23:09 2018
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/11/29 12:26:16 ryoon Exp $
+$NetBSD: MESSAGE,v 1.3 2018/01/01 10:23:09 wiz Exp $
To use baserCMS, you will need to perform the following steps.
@@ -12,7 +12,7 @@ To use baserCMS, you will need to perfor
mysql> create database basercms character set utf8 ;
mysql> grant all privileges on basercms.* to baser@localhost identified by 'baser-password';
-2. Install apache httpd server, for example www/apache22 and www/ap-php.
+2. Install apache httpd server, for example www/apache24 and www/ap-php.
3. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
Index: pkgsrc/www/php-tiki6/MESSAGE
diff -u pkgsrc/www/php-tiki6/MESSAGE:1.3 pkgsrc/www/php-tiki6/MESSAGE:1.4
--- pkgsrc/www/php-tiki6/MESSAGE:1.3 Sun Dec 11 13:01:50 2011
+++ pkgsrc/www/php-tiki6/MESSAGE Mon Jan 1 10:23:09 2018
@@ -1,9 +1,9 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2011/12/11 13:01:50 ryoon Exp $
+$NetBSD: MESSAGE,v 1.4 2018/01/01 10:23:09 wiz Exp $
-To use tiki with Apache 2.2, you will need to perform the following steps.
+To use tiki with Apache, you will need to perform the following steps.
-1. Install www/apache22 and www/ap-php
+1. Install www/apache24 and www/ap-php
2. Setup PHP. At least, ${PREFIX}/etc/php.ini should have date.timezone line.
If your machine are located in Tokyo, Japan, you should get the following.
Index: pkgsrc/www/py-mod_wsgi/Makefile
diff -u pkgsrc/www/py-mod_wsgi/Makefile:1.15 pkgsrc/www/py-mod_wsgi/Makefile:1.16
--- pkgsrc/www/py-mod_wsgi/Makefile:1.15 Sat Dec 16 07:46:30 2017
+++ pkgsrc/www/py-mod_wsgi/Makefile Mon Jan 1 10:23:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/12/16 07:46:30 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/01 10:23:09 wiz Exp $
DISTNAME= mod_wsgi-4.5.24
PKGNAME= ${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.modwsgi.org/
COMMENT= WSGI module for apache
LICENSE= apache-2.0
-PKG_APACHE_ACCEPTED= apache22 apache24
-
DEPENDS+= ${PYPKGPREFIX}-mod_wsgi-metrics>=1.0.0:../../www/py-mod_wsgi-metrics
APACHE_MODULE= yes
Home |
Main Index |
Thread Index |
Old Index