Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Jan 2019 04:14:23 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490623 - in head/net/geoipupdate: . files
Message-ID:  <201901180414.x0I4ENG7093841@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Fri Jan 18 04:14:23 2019
New Revision: 490623
URL: https://svnweb.freebsd.org/changeset/ports/490623

Log:
  Update to 4.0.1
  
  Add a MANPAGES option. If you're building this from source and don't
  want to spend 2 hours on 200 ports, the manpages are the same as the
  DOCS. Just use those.

Added:
  head/net/geoipupdate/files/
  head/net/geoipupdate/files/patch-Makefile   (contents, props changed)
Modified:
  head/net/geoipupdate/Makefile
  head/net/geoipupdate/distinfo

Modified: head/net/geoipupdate/Makefile
==============================================================================
--- head/net/geoipupdate/Makefile	Fri Jan 18 03:00:22 2019	(r490622)
+++ head/net/geoipupdate/Makefile	Fri Jan 18 04:14:23 2019	(r490623)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoipupdate
-PORTVERSION=	4.0.0
+PORTVERSION=	4.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net geography
 
@@ -25,8 +25,16 @@ MAKE_ENV+=	GOPATH=${WRKSRC} \
 		CONFFILE=${PREFIX}/etc/GeoIP.conf \
 		DATADIR=${PREFIX}/share/GeoIP
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS MANPAGES
+OPTIONS_DEFAULT=MANPAGES
 
+MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+MANPAGES_PLIST_FILES=	man/man1/geoipupdate.1.gz \
+			man/man5/GeoIP.conf.5.gz
+MANPAGES_USES=		perl5
+MANPAGES_USE=		perl5:build
+MANPAGES_VARS=		MAKE_JOBS_UNSAFE=yes
+
 PLIST_FILES=	bin/geoipupdate \
 		'@sample etc/GeoIP.conf.sample' \
 		'@dir share/GeoIP'
@@ -35,6 +43,9 @@ PORTDOCS=	GeoIP.conf.md geoipupdate.md
 post-extract:
 	${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 
+post-patch-MANPAGES-off:
+	${REINPLACE_CMD} -e '/make-man-pages.pl/d' ${WRKSRC}/Makefile
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP
 	${INSTALL_PROGRAM} ${WRKSRC}/build/geoipupdate ${STAGEDIR}${PREFIX}/bin
@@ -43,5 +54,9 @@ do-install:
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/build && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+do-install-MANPAGES-on:
+	${INSTALL_MAN} ${WRKSRC}/build/geoipupdate.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/build/GeoIP.conf.5  ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>

Modified: head/net/geoipupdate/distinfo
==============================================================================
--- head/net/geoipupdate/distinfo	Fri Jan 18 03:00:22 2019	(r490622)
+++ head/net/geoipupdate/distinfo	Fri Jan 18 04:14:23 2019	(r490623)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547578530
-SHA256 (maxmind-geoipupdate-v4.0.0_GH0.tar.gz) = 89e86d6e54d26d4482f4b5f1c75409e23b4f202ad1f4425e6f97341ea7731e61
-SIZE (maxmind-geoipupdate-v4.0.0_GH0.tar.gz) = 105955
+TIMESTAMP = 1547771783
+SHA256 (maxmind-geoipupdate-v4.0.1_GH0.tar.gz) = 89d3c2bfd87095ecf3f093c7139f1fd4b8c5faae67606592cfe2edcb48e5cf16
+SIZE (maxmind-geoipupdate-v4.0.1_GH0.tar.gz) = 106890

Added: head/net/geoipupdate/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/geoipupdate/files/patch-Makefile	Fri Jan 18 04:14:23 2019	(r490623)
@@ -0,0 +1,15 @@
+--- Makefile.orig	2019-01-18 03:44:31 UTC
++++ Makefile
+@@ -45,10 +45,10 @@ $(BUILDDIR)/GeoIP.conf.md: $(BUILDDIR) doc/GeoIP.conf.
+ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md
+ 	sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
+ 
+-$(BUILDDIR)/GeoIP.conf.5:
++$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)
+ 	dev-bin/make-man-pages.pl
+ 
+-$(BUILDDIR)/geoipupdate.1:
++$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)
+ 	dev-bin/make-man-pages.pl
+ 
+ clean:



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