aboutsummaryrefslogtreecommitdiffstats
path: root/www/mod_geoip
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2008-03-19 15:47:40 +0800
committerache <ache@FreeBSD.org>2008-03-19 15:47:40 +0800
commit1ae9c89accd24d6aaae6436384d3576cb1bd50ab (patch)
tree5b1304fcbc618cc394491e3ae07b89625b7c530e /www/mod_geoip
parent29164e892f9e2661e4a9c59db33ccd953dc73741 (diff)
downloadfreebsd-ports-graphics-1ae9c89accd24d6aaae6436384d3576cb1bd50ab.tar.gz
freebsd-ports-graphics-1ae9c89accd24d6aaae6436384d3576cb1bd50ab.tar.zst
freebsd-ports-graphics-1ae9c89accd24d6aaae6436384d3576cb1bd50ab.zip
Simplify and reorganize Makefile and pkg-message in the similar way
like mod_geoip2 does.
Diffstat (limited to 'www/mod_geoip')
-rw-r--r--www/mod_geoip/Makefile20
-rw-r--r--www/mod_geoip/files/pkg-message.in11
-rw-r--r--www/mod_geoip/pkg-message14
3 files changed, 21 insertions, 24 deletions
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile
index 4471a8ee7f2..4b8d57595bf 100644
--- a/www/mod_geoip/Makefile
+++ b/www/mod_geoip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mod_geoip
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www geography
MASTER_SITES= http://www.maxmind.com/download/geoip/api/mod_geoip/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -18,22 +18,22 @@ COMMENT= An Apache module that provides the country code of the client's IP
BUILD_DEPENDS= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
RUN_DEPENDS= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
+CONFLICTS= mod_geoip2-[0-9]*
+
USE_APACHE= 1.3
AP_FAST_BUILD= yes
AP_GENPLIST= yes
-AP_EXTRAS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -lGeoIP
-
-.include <bsd.port.pre.mk>
+AP_INC+= ${LOCALBASE}/include
+AP_LIB+= ${LOCALBASE}/lib -lGeoIP
-PORTDOCS= Changes INSTALL README README.php
+SUB_FILES+= pkg-message
+PORTDOCS= Changes INSTALL README README.php
post-install:
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/mod_geoip
-.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/mod_geoip/
-.endfor
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_geoip/files/pkg-message.in b/www/mod_geoip/files/pkg-message.in
new file mode 100644
index 00000000000..05dc4359e32
--- /dev/null
+++ b/www/mod_geoip/files/pkg-message.in
@@ -0,0 +1,11 @@
+*******************************************************************************
+Please edit your apache.conf or httpd.conf to enable and setup this module.
+
+You can always refer to the useful documents held in:
+%%DOCSDIR%%
+
+When it is done, do the following to apply the modifications:
+
+ apachectl configtest (and correct any errors reported)
+ apachectl restart
+*******************************************************************************
diff --git a/www/mod_geoip/pkg-message b/www/mod_geoip/pkg-message
deleted file mode 100644
index 06e3376a1a1..00000000000
--- a/www/mod_geoip/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-************************************************************
-Please edit your apache.conf or httpd.conf to enable and
-setup this module.
-
-You can always refer to the useful documents held in
-${PREFIX}/share/doc/mod_geoip/, where ${PREFIX} is
-typically /usr/local.
-
-When it's done, do the following to take effect:
-
- apachectl configtest (and correct any errors reported)
- apachectl restart
-
-************************************************************