Here are some tweaks, and a new tgz attached. Note that I have not tried running it yet, so there may be a little more to do.
Upstream need to learn about not using malloc(foo * bar), and to check their malloc return values... diff --git Makefile Makefile index bc6357b..813f712 100644 --- Makefile +++ Makefile @@ -4,22 +4,24 @@ COMMENT= authoritative-only GeoIP-aware DNS server SHARED_ONLY= Yes V= 1.11.2 -DISTNAME= gdnsd-${V} +DISTNAME= gdnsd-$V +EXTRACT_SUFX= .tar.xz CATEGORIES= net HOMEPAGE= http://gdnsd.org/ MAINTAINER= Samuel Streiner <samuel.strei...@gmail.com> -DISTFILES= gdnsd-${V}.tar.xz -MASTER_SITES= https://github.com/blblack/gdnsd/releases/download/v${V}/ -EXTRACT_SUFFIX= .tar.xz +MASTER_SITES= https://github.com/blblack/gdnsd/releases/download/v$V/ # GPLv3+ PERMIT_PACKAGE_CDROM= yes +WANTLIB += c ev m pthread + CONFIGURE_STYLE= gnu AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.11 +SUBST_VARS+= VARBASE LIBTOOL_FLAGS= --tag=disable-static @@ -32,12 +34,16 @@ BUILD_DEPENDS= devel/libtool \ devel/ragel \ ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} +# used for tests +BUILD_DEPENDS+= archivers/xz \ + net/curl LIB_DEPENDS= devel/libev RUN_DEPENDS= net/GeoIP -TEST_DEPENDS= www/p5-libwww \ +TEST_DEPENDS= ${BUILD_DEPENDS} \ + www/p5-libwww \ net/p5-Socket6 \ net/p5-IO-Socket-INET6 \ net/p5-Net-DNS @@ -49,17 +55,7 @@ pre-configure: ./autogen.sh post-install: - rm ${PREFIX}/lib/gdnsd/libgdnsd.la - rm ${PREFIX}/lib/gdnsd/plugin_extmon.la - rm ${PREFIX}/lib/gdnsd/plugin_geoip.la - rm ${PREFIX}/lib/gdnsd/plugin_http_status.la - rm ${PREFIX}/lib/gdnsd/plugin_metafo.la - rm ${PREFIX}/lib/gdnsd/plugin_multifo.la - rm ${PREFIX}/lib/gdnsd/plugin_null.la - rm ${PREFIX}/lib/gdnsd/plugin_reflect.la - rm ${PREFIX}/lib/gdnsd/plugin_simplefo.la - rm ${PREFIX}/lib/gdnsd/plugin_static.la - rm ${PREFIX}/lib/gdnsd/plugin_tcp_connect.la - rm ${PREFIX}/lib/gdnsd/plugin_weighted.la + rm ${PREFIX}/lib/gdnsd/*.la ${PREFIX}/share/doc/gdnsd/*.pod \ + ${PREFIX}/share/doc/gdnsd/*.txt .include <bsd.port.mk> diff --git distinfo distinfo index 6b343f9..32d1151 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (gdnsd-1.11.2.tar.xz) = 6f89dce5ed6058ca87a6c67f38f8a8ef5df90d0e2349568dbf300849d4455368 +SHA256 (gdnsd-1.11.2.tar.xz) = b4nc5e1gWMqHpsZ/OPio7135DQ4jSVaNvzAISdRFU2g= SIZE (gdnsd-1.11.2.tar.xz) = 629628 diff --git pkg/PFRAG.shared pkg/PFRAG.shared deleted file mode 100644 index 7fdb472..0000000 --- pkg/PFRAG.shared +++ /dev/null @@ -1,13 +0,0 @@ -@comment $OpenBSD$ -lib/gdnsd/libgdnsd.so -lib/gdnsd/plugin_extmon.so -lib/gdnsd/plugin_geoip.so -lib/gdnsd/plugin_http_status.so -lib/gdnsd/plugin_metafo.so -lib/gdnsd/plugin_multifo.so -lib/gdnsd/plugin_null.so -lib/gdnsd/plugin_reflect.so -lib/gdnsd/plugin_simplefo.so -lib/gdnsd/plugin_static.so -lib/gdnsd/plugin_tcp_connect.so -lib/gdnsd/plugin_weighted.so diff --git pkg/PLIST pkg/PLIST index 88792aa..276fa6e 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,7 +1,6 @@ @comment $OpenBSD$ -@newgroup _gdnsd:732 -@newuser _gdnsd:732:_gdnsd:daemon:gdnsd Server:/var/empty:/sbin/nologin -%%SHARED%% +@newgroup _gdnsd:733 +@newuser _gdnsd:733:_gdnsd:daemon:gdnsd Server:/var/empty:/sbin/nologin @bin bin/gdnsd_geoip_test include/gdnsd/ include/gdnsd/compiler.h @@ -17,6 +16,18 @@ include/gdnsd/plugin.h include/gdnsd/stats.h include/gdnsd/vscf.h lib/gdnsd/ +lib/gdnsd/libgdnsd.so +lib/gdnsd/plugin_extmon.so +lib/gdnsd/plugin_geoip.so +lib/gdnsd/plugin_http_status.so +lib/gdnsd/plugin_metafo.so +lib/gdnsd/plugin_multifo.so +lib/gdnsd/plugin_null.so +lib/gdnsd/plugin_reflect.so +lib/gdnsd/plugin_simplefo.so +lib/gdnsd/plugin_static.so +lib/gdnsd/plugin_tcp_connect.so +lib/gdnsd/plugin_weighted.so libexec/gdnsd/ @bin libexec/gdnsd/gdnsd_extmon_helper @man man/man1/gdnsd_geoip_test.1 @@ -37,35 +48,9 @@ share/doc/gdnsd/COPYING share/doc/gdnsd/INSTALL share/doc/gdnsd/NEWS share/doc/gdnsd/README.md -share/doc/gdnsd/gdnsd-plugin-api.pod -share/doc/gdnsd/gdnsd-plugin-api.txt -share/doc/gdnsd/gdnsd-plugin-extmon.pod -share/doc/gdnsd/gdnsd-plugin-extmon.txt -share/doc/gdnsd/gdnsd-plugin-geoip.pod -share/doc/gdnsd/gdnsd-plugin-geoip.txt -share/doc/gdnsd/gdnsd-plugin-metafo.pod -share/doc/gdnsd/gdnsd-plugin-metafo.txt -share/doc/gdnsd/gdnsd-plugin-multifo.pod -share/doc/gdnsd/gdnsd-plugin-multifo.txt -share/doc/gdnsd/gdnsd-plugin-simplefo.pod -share/doc/gdnsd/gdnsd-plugin-simplefo.txt -share/doc/gdnsd/gdnsd-plugin-weighted.pod -share/doc/gdnsd/gdnsd-plugin-weighted.txt -share/doc/gdnsd/gdnsd.config.pod -share/doc/gdnsd/gdnsd.config.txt -share/doc/gdnsd/gdnsd.pod -share/doc/gdnsd/gdnsd.txt -share/doc/gdnsd/gdnsd.zonefile.pod -share/doc/gdnsd/gdnsd.zonefile.txt -share/doc/gdnsd/gdnsd_geoip_test.pod -share/doc/gdnsd/gdnsd_geoip_test.txt -share/doc/gdnsd/gdnsd_manual.pod -share/doc/gdnsd/gdnsd_manual.txt -@owner -@group -@sample /var/gdnsd/ -@sample /var/gdnsd/etc/ -@sample /var/gdnsd/etc/geoip/ -@sample /var/gdnsd/etc/zones/ -@sample /var/gdnsd/run/ +@sample ${VARBASE}/gdnsd/ +@sample ${VARBASE}/gdnsd/etc/ +@sample ${VARBASE}/gdnsd/etc/geoip/ +@sample ${VARBASE}/gdnsd/etc/zones/ +@sample ${VARBASE}/gdnsd/run/ @rcscript ${RCDIR}/gdnsd
gdnsd.tgz
Description: application/tar-gz