diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile index c3e2cd863e56..3920118128d3 100644 --- a/net/geoipupdate/Makefile +++ b/net/geoipupdate/Makefile @@ -1,62 +1,60 @@ # Created by: adamw PORTNAME= geoipupdate PORTVERSION= 4.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net geography MAINTAINER= adamw@FreeBSD.org COMMENT= Fetch the latest copies of the GeoIP2 databases LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -RUN_DEPENDS= ca_root_nss>=3:security/ca_root_nss - USES= gmake go:modules,no_targets GO_MODULE= github.com/maxmind/geoipupdate/v4 MAKE_ENV+= ${GO_ENV} \ CONFFILE=${PREFIX}/etc/GeoIP.conf \ DATADIR=${PREFIX}/share/GeoIP \ VERSION=${DISTVERSIONFULL} OPTIONS_DEFINE= DOCS MANPAGES OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= lowdown:textproc/lowdown MANPAGES_PLIST_FILES= man/man1/geoipupdate.1.gz \ man/man5/GeoIP.conf.5.gz PLIST_FILES= bin/geoipupdate \ '@sample etc/GeoIP.conf.sample' \ '@dir share/GeoIP' PORTDOCS= GeoIP.conf.md geoipupdate.md SUB_FILES= pkg-message do-build-MANPAGES-on: # lowdown generates everything as section 7 { ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \ | ${LOCALBASE}/bin/lowdown -s -Tman \ | ${SED} -e '1s/7/1/' > ${WRKSRC}/build/geoipupdate.1 { ${PRINTF} "title: GeoIP.conf\n\n" && ${CAT} ${WRKSRC}/doc/GeoIP.conf.md; } \ | ${LOCALBASE}/bin/lowdown -s -Tman \ | ${SED} -e '1s/7/5/' > ${WRKSRC}/build/GeoIP.conf.5 do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP ${INSTALL_PROGRAM} ${WRKSRC}/build/geoipupdate ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/build/GeoIP.conf ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample 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 diff --git a/www/caddy/Makefile b/www/caddy/Makefile index cc1cb226de29..bdd16ef4520a 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,37 +1,35 @@ # Created by: fabian.freyer@physik.tu-berlin.de PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www DIST_SUBDIR= caddy MAINTAINER= adamw@FreeBSD.org COMMENT= Fast, cross-platform HTTP/2 web server with automatic HTTPS LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss - USES= cpe go:modules CPE_VENDOR= caddyserver USE_RC_SUBR= caddy SUB_FILES= Caddyfile.sample caddy pkg-message PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR_REL}/Caddyfile.sample" GO_TARGET= ./cmd/caddy # If go.mod is sufficient: # GO_MODULE= github.com/caddyserver/caddy/v2 # If modules must be specified manually: .include "${.CURDIR}/modules.mk" post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/Caddyfile.sample ${STAGEDIR}${ETCDIR} .include