*: remove references to eol'd apache22

This commit is contained in:
Thomas Klausner 2018-01-01 11:20:44 +01:00
parent c4dbc86334
commit 157446a479
12 changed files with 5 additions and 105 deletions

View file

@ -450,6 +450,7 @@ SUBDIR+= cpdup
SUBDIR+= cpluff
SUBDIR+= cpm
SUBDIR+= cpqarrayd
SUBDIR+= cpuminer-multi
SUBDIR+= crabemu
SUBDIR+= crawl-stone-soup
SUBDIR+= creal
@ -2304,7 +2305,6 @@ SUBDIR+= osmo
SUBDIR+= osmo-sdr-git
SUBDIR+= osmose
SUBDIR+= osxinfo
SUBDIR+= otptool
SUBDIR+= otrtool
SUBDIR+= ots
SUBDIR+= outguess

View file

@ -11,7 +11,6 @@ RUBY_VERSIONS_ACCEPTED= 22 23 # www/ruby-rack via wip/ruby-passenger
.include "../../wip/ruby-passenger/Makefile.common"
PKG_APACHE_ACCEPTED= apache24 apache22
APACHE_MODULE= YES
USE_APR= YES

View file

@ -19,11 +19,7 @@ WWW_GROUP?= ${APACHE_GROUP}
BUILD_DEFS+= APACHE_USER APACHE_GROUP
.include "../../mk/apache.mk"
DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.5:../../www/ap-php
.if !empty(PKG_APACHE:Mapache22)
WWW_CONF_FILE= apache22.conf
.else
WWW_CONF_FILE= apache24.conf
.endif
WWW_SYSCONFDIR= ${PREFIX}/etc/httpd
.endif

View file

@ -5,17 +5,6 @@ The Ganglia Web Frontend has been installed in the directory
You must add appropriate configuration directives to your
web server configuration file.
A typical apache22 configuration would be:
Alias /ganglia/ "%%PREFIX%%/%%WEBFRONTDIR%%/"
<Directory "%%PREFIX%%/%%WEBFRONTDIR%%">
Options Indexes FollowSymlinks MultiViews
AllowOverride None
Order allow,deny
Allow from all
</Directory>
A typical apache24 configuration would be:
Alias /ganglia/ "%%PREFIX%%/%%WEBFRONTDIR%%/"

View file

@ -6,12 +6,12 @@ PKG_OPTIONS_OPTIONAL_GROUPS+= database
PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
PKG_OPTIONS_OPTIONAL_GROUPS+= webserver
PKG_OPTIONS_GROUP.webserver= apache apache22 apache24 nginx
PKG_OPTIONS_GROUP.webserver= apache24 nginx
PKG_OPTIONS_OPTIONAL_GROUPS+= database
PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
PKG_SUGGESTED_OPTIONS= sqlite3 nginx
PKG_SUGGESTED_OPTIONS= sqlite3 apache22
PKG_SUGGESTED_OPTIONS= sqlite3 apache24
.include "../../mk/bsd.options.mk"
@ -35,17 +35,6 @@ OPT_MYSQL=echo
DEPENDS+= nginx-[0-9]*:../../www/nginx
.endif
.if !empty(PKG_OPTIONS:Mapache)
DEPENDS+= apache-[0-9]*:../../www/apache
.include "../../www/apache/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mapache22)
DEPENDS+= apache-[0-9]*:../../www/apache22
DEPENDS+= ap[0-9]*-passenger-[0-9]*:../../wip/ap2-passenger
.include "../../www/apache22/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mapache24)
DEPENDS+= apache-[0-9]*:../../www/apache24
.include "../../www/apache24/buildlink3.mk"

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.5 2012/10/01 21:52:41 asau Exp $
DISTNAME= koha-2.2.9
#PKGREVISION= 0
PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://download.savannah.nongnu.org/releases/koha/
@ -10,7 +10,7 @@ HOMEPAGE= http://koha.org/
COMMENT= Koha is an integrated library system
DEPENDS+= mysql-client>=5.5:../../databases/mysql55-client
DEPENDS+= apache>=2.2:../../www/apache22
DEPENDS+= apache>=2.4:../../www/apache24
DEPENDS+= p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
DEPENDS+= p5-Date-Manip>=5.44:../../devel/p5-Date-Manip

View file

@ -1,2 +0,0 @@
Otptool is a client utility for two-factor authentication using one-time
passwords (OTP) generated via the HOTP/OATH algorithm defined in RFC 4226.

View file

@ -1,40 +0,0 @@
# $NetBSD: Makefile,v 1.9 2017/08/01 17:40:15 wiz Exp $
DISTNAME= ${GITHUB_TAG}
GITHUB_TAG= 1.1.8
PKGNAME= otptool-${DISTNAME}
GITHUB_PROJECT= mod-authn-otp
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=archiecobbs/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/archiecobbs/mod-authn-otp
COMMENT= One-Time Password command line utility
LICENSE= apache-2.0
WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
PKG_APACHE_ACCEPTED= apache22
USE_LANGUAGES+= c
HAS_CONFIGURE= yes
#GNU_CONFIGURE= yes
USE_TOOLS+= autoreconf autoconf automake
REPLACE_SH+= autogen.sh
.include "../../mk/apache.mk"
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
pre-configure:
cd ${WRKSRC} && sh ./autogen.sh
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/otptool ${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/otptool.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../www/apache22/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,3 +0,0 @@
@comment $NetBSD: PLIST,v 1.1 2012/11/10 22:13:47 pettai Exp $
bin/otptool
man/man1/otptool.1

View file

@ -1,6 +0,0 @@
The key is commonly
encoded base32.
Convert to hex first
as otptool does not
do this for you.

View file

@ -1,7 +0,0 @@
$NetBSD: distinfo,v 1.3 2015/11/04 01:17:53 agc Exp $
SHA1 (1.1.8.tar.gz) = 9dda1e17d8d5d2b38fd5d80fe95deb5d0de5f8d3
RMD160 (1.1.8.tar.gz) = 2b414f6596be5e18590093c0516a0b27d5240407
SHA512 (1.1.8.tar.gz) = 28e9942c70ba6aa4e4569b9f13fdaaf606b177b1562fdb6920bc3d2c3ab61ddcff108d6ebe70d209b782c68f03f56738b9e86cbfb29dffcc858d8f8e405a2127
Size (1.1.8.tar.gz) = 24882 bytes
SHA1 (patch-configure.ac) = 9ef9dd3a388828012f09cb5dcaec00bd8d61a09e

View file

@ -1,15 +0,0 @@
$NetBSD$
--- configure.ac.orig 2017-10-30 15:31:02.000000000 +0000
+++ configure.ac
@@ -30,8 +30,8 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PATH_PROG(STRIP, strip)
AC_PATH_PROG(CP, cp)
-AC_PATH_PROG(APXS, apxs, "no", [/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin])
-AC_PATH_PROG(APXS2, apxs2, "no", [/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin])
+AC_PATH_PROG(APXS, apxs, "no", [/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin ${PREFIX}/sbin])
+AC_PATH_PROG(APXS2, apxs2, "no", [/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin ${PREFIX}/sbin])
[test x"$APXS2" = "xno" -a x"$APXS" = "xno" && ] AC_MSG_ERROR([cannot find apxs or apxs2])
[test x"$APXS2" != "xno" && APXS="$APXS2"]