From owner-svn-ports-all@freebsd.org Sat Feb 9 13:36:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46A7214E22D6; Sat, 9 Feb 2019 13:36:08 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8CB76C39A; Sat, 9 Feb 2019 13:36:07 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA6A61606; Sat, 9 Feb 2019 13:36:07 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x19Da7b7048391; Sat, 9 Feb 2019 13:36:07 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x19Da7cL048388; Sat, 9 Feb 2019 13:36:07 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201902091336.x19Da7cL048388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Sat, 9 Feb 2019 13:36:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492497 - in head/www/mod_maxminddb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/www/mod_maxminddb: . files X-SVN-Commit-Revision: 492497 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D8CB76C39A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Feb 2019 13:36:08 -0000 Author: mmokhi Date: Sat Feb 9 13:36:06 2019 New Revision: 492497 URL: https://svnweb.freebsd.org/changeset/ports/492497 Log: www/mod_maxminddb: Fix dynamic link error with libmaxminddb.so The module wasn't linked correctly with libmaxminddb.so when using `AP_FAST_BUILD`, because of not having correct ld-flags. Switch to default build (with a patch) solves the problem. Reported by: ler Sponsored by: The FreeBSD Foundation Added: head/www/mod_maxminddb/pkg-plist (contents, props changed) Modified: head/www/mod_maxminddb/Makefile head/www/mod_maxminddb/files/patch-src_Makefile.am Modified: head/www/mod_maxminddb/Makefile ============================================================================== --- head/www/mod_maxminddb/Makefile Sat Feb 9 13:23:32 2019 (r492496) +++ head/www/mod_maxminddb/Makefile Sat Feb 9 13:36:06 2019 (r492497) @@ -2,6 +2,7 @@ PORTNAME= mod_maxminddb PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -18,8 +19,10 @@ GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= maxmind -AP_FAST_BUILD= yes -AP_GENPLIST= yes -SRC_FILE= src/${PORTNAME}.c +post-patch: + @${REINPLACE_CMD} -e 's|%%LIBEXECDEST%%|${STAGEDIR}${PREFIX}/${APACHEMODDIR}|g' ${WRKSRC}/src/Makefile.am + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .include Modified: head/www/mod_maxminddb/files/patch-src_Makefile.am ============================================================================== --- head/www/mod_maxminddb/files/patch-src_Makefile.am Sat Feb 9 13:23:32 2019 (r492496) +++ head/www/mod_maxminddb/files/patch-src_Makefile.am Sat Feb 9 13:36:06 2019 (r492497) @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2019-01-19 16:36:41 UTC +--- src/Makefile.am.orig 2016-10-19 20:07:32 UTC +++ src/Makefile.am -@@ -1,12 +1,13 @@ +@@ -1,15 +1,16 @@ AUTOMAKE_OPTIONS = foreign WC=-Wc,"$(CFLAGS)" +WL=-Wl,"$(LDFLAGS)" @@ -14,4 +14,8 @@ + $(APXS) -c $(WL) $(LIBMAXMINDDB_LDFLAGS) $(LIBS) $(WC) $(APXS_LDFLAGS) mod_maxminddb.c install-exec-local: module - $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so +- $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so ++ $(APXS) -S LIBEXECDIR=%%LIBEXECDEST%% -i -a -n maxminddb mod_maxminddb.la ### maxminddb .libs/mod_maxminddb.so + + CLEANFILES= *.la *.lo *.o *.so *.slo .libs/* + Added: head/www/mod_maxminddb/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_maxminddb/pkg-plist Sat Feb 9 13:36:06 2019 (r492497) @@ -0,0 +1 @@ +%%APACHEMODDIR%%/%%AP_MODULE%%