Drop the old geoip module, and reduce some unnecessary duplication in the Makefile. ok?
Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.839 diff -u -p -r1.839 Makefile --- devel/quirks/Makefile 4 Feb 2020 06:29:37 -0000 1.839 +++ devel/quirks/Makefile 8 Feb 2020 13:38:30 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.230 +PKGNAME = quirks-3.231 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.857 diff -u -p -r1.857 Quirks.pm --- devel/quirks/files/Quirks.pm 4 Feb 2020 06:29:37 -0000 1.857 +++ devel/quirks/files/Quirks.pm 8 Feb 2020 13:38:31 -0000 @@ -1369,6 +1369,7 @@ my $obsolete_reason = { 'dclib' => 3, 'luma' => 3, 'qhacc' => 15, + 'nginx-geoip' => 16, }; # reasons for obsolete packages @@ -1389,6 +1390,7 @@ my @msg = ( "has a dependency on obsolete software", #13 "python2 port superseded by python3 version", #14 "no longer maintained upstream, suggest homebank, gnucash, kmymoney", #15 + "old GeoIP databases end-of-life, see alternative using geoip2/libmaxminddb", #16 ); # ->is_base_system($handle, $state): Index: www/nginx/Makefile =================================================================== RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.141 diff -u -p -r1.141 Makefile --- www/nginx/Makefile 10 Jan 2020 13:39:26 -0000 1.141 +++ www/nginx/Makefile 8 Feb 2020 13:38:31 -0000 @@ -4,7 +4,6 @@ BROKEN-hppa= src/core/ngx_rwlock.c:116:2 COMMENT-main= robust and small HTTP server and mail proxy server COMMENT-image_filter= nginx image filter module -COMMENT-geoip= nginx GeoIP module COMMENT-geoip2= nginx GeoIP2 module COMMENT-xslt= nginx XSLT filter module COMMENT-mailproxy= nginx mail proxy module @@ -27,7 +26,6 @@ VERSION-rtmp= 1.2.1 PKGNAME-main= ${DISTNAME} PKGNAME-image_filter= nginx-image_filter-${VERSION} -PKGNAME-geoip= nginx-geoip-${VERSION} PKGNAME-geoip2= nginx-geoip2-${VERSION} PKGNAME-xslt= nginx-xslt-${VERSION} PKGNAME-mailproxy= nginx-mailproxy-${VERSION} @@ -68,8 +66,10 @@ MAINTAINER= Robert Nagy <robert@openbsd. # BSD-like PERMIT_PACKAGE= Yes -MULTI_PACKAGES = -main -image_filter -geoip -geoip2 -xslt -mailproxy -stream \ - -naxsi -perl -passenger -headers_more -ldap_auth -lua -rtmp +MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES} + +MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \ + -passenger -headers_more -ldap_auth -lua -rtmp FLAVOR ?= PSEUDO_FLAVORS = no_lua no_passenger @@ -82,7 +82,6 @@ WANTLIB-main= c z pcre ssl crypto WANTLIB-mailproxy= WANTLIB-stream= WANTLIB-image_filter= gd -WANTLIB-geoip= GeoIP WANTLIB-geoip2= maxminddb WANTLIB-rtmp= WANTLIB-xslt= exslt xml2 xslt @@ -97,7 +96,6 @@ LIB_DEPENDS-main= devel/pcre LIB_DEPENDS-xslt= textproc/libxml \ textproc/libxslt LIB_DEPENDS-image_filter=graphics/gd -LIB_DEPENDS-geoip= net/GeoIP LIB_DEPENDS-geoip2= net/libmaxminddb LIB_DEPENDS-ldap_auth= databases/openldap LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS} @@ -113,19 +111,10 @@ RUN_DEPENDS-passenger= ${RUN_DEPENDS} \ NGINX_DIR= /var/www SUBST_VARS= NGINX_DIR -NGINX_MODULES_DIR= ${NGINX_DIR}/modules -PREFIX-mailproxy= ${NGINX_MODULES_DIR} -PREFIX-stream= ${NGINX_MODULES_DIR} -PREFIX-image_filter= ${NGINX_MODULES_DIR} -PREFIX-geoip= ${NGINX_MODULES_DIR} -PREFIX-geoip2= ${NGINX_MODULES_DIR} -PREFIX-xslt= ${NGINX_MODULES_DIR} -PREFIX-ldap_auth= ${NGINX_MODULES_DIR} -PREFIX-lua= ${NGINX_MODULES_DIR} -PREFIX-headers_more= ${NGINX_MODULES_DIR} -PREFIX-passenger= ${NGINX_MODULES_DIR} -PREFIX-rtmp= ${NGINX_MODULES_DIR} +.for i in ${MODULE_PACKAGES} +PREFIX$i= ${NGINX_DIR}/modules +.endfor CFLAGS+= -Wall -Wpointer-arith \ -I "${LOCALBASE}/include/libxml2" \ @@ -175,7 +164,6 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \ --with-http_auth_request_module \ --with-http_dav_module \ --with-http_image_filter_module=dynamic \ - --with-http_geoip_module=dynamic \ --with-http_gzip_static_module \ --with-http_gunzip_module \ --with-http_perl_module=dynamic \ Index: www/nginx/pkg/DESCR-geoip =================================================================== RCS file: www/nginx/pkg/DESCR-geoip diff -N www/nginx/pkg/DESCR-geoip --- www/nginx/pkg/DESCR-geoip 4 Nov 2016 22:13:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -The ngx_http_geoip_module module creates variables with values depending on -the client IP address, using the precompiled MaxMind databases. Index: www/nginx/pkg/PLIST-geoip =================================================================== RCS file: www/nginx/pkg/PLIST-geoip diff -N www/nginx/pkg/PLIST-geoip --- www/nginx/pkg/PLIST-geoip 4 Nov 2016 22:13:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PLIST-geoip,v 1.1 2016/11/04 22:13:43 jeremy Exp $ -ngx_http_geoip_module.so
