Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Feb 2019 13:36:07 +0000 (UTC)
From:      Mahdi Mokhtari <mmokhi@FreeBSD.org>
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
Message-ID:  <201902091336.x19Da7cL048388@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902091336.x19Da7cL048388>