Attachment 188741 Details for Bug 224262 – patch file

[patch] patch file

libpostal-1.0.0.patch (text/plain), 9.94 KB, created by Dmitri Goutnik on 2017-12-12 03:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2017-12-12 03:42:27 UTC

Size: 9.94 KB

patch

obsolete

>Index: devel/libpostal/Makefile
>===================================================================
>--- devel/libpostal/Makefile	(nonexistent)
>+++ devel/libpostal/Makefile	(working copy)
>@@ -0,0 +1,54 @@
>+# $FreeBSD$
>+
>+PORTNAME=	libpostal
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.0.0
>+CATEGORIES=	devel geography
>+
>+MAINTAINER=	dg@syrec.org
>+COMMENT=	Library for parsing/normalizing street addresses around the world
>+
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+RUN_DEPENDS=	${LOCALBASE}/bin/curl:ftp/curl
>+
>+USES=		autoreconf libtool
>+USE_LDCONFIG=	yes
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--datadir=${LIBPOSTAL_DATADIR} \
>+		--disable-data-download
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	openvenues
>+TEST_TARGET=	check
>+
>+LIBPOSTAL_DATADIR?=	/var/db/${PORTNAME}
>+
>+SUB_FILES=	pkg-message
>+SUB_LIST=	PORTNAME=${PORTNAME} \
>+		LIBPOSTAL_DATADIR=${LIBPOSTAL_DATADIR}
>+PLIST_SUB=	LIBPOSTAL_DATADIR=${LIBPOSTAL_DATADIR}
>+
>+PORTDOCS=	README.md
>+
>+OPTIONS_DEFINE=	CBLAS DOCS SSE2
>+CBLAS_DESC=	Build with CBLAS/OPENBLAS
>+SSE2_DESC=	Enable SSE2 optimization
>+
>+CBLAS_BUILD_DEPENDS=	${LOCALBASE}/include/cblas.h:math/cblas \
>+			${LOCALBASE}/lib/libopenblas.a:math/openblas
>+CBLAS_CONFIGURE_WITH=	cblas=${LOCALBASE}/lib/libopenblas.a
>+
>+SSE2_CONFIGURE_ENABLE=	sse2
>+
>+pre-configure:
>+	cd ${WRKSRC} && ${SH} bootstrap.sh
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpostal.so
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/address_parser ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/libpostal ${STAGEDIR}${PREFIX}/bin
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/libpostal/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/distinfo
>===================================================================
>--- devel/libpostal/distinfo	(nonexistent)
>+++ devel/libpostal/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1513006366
>+SHA256 (openvenues-libpostal-v1.0.0_GH0.tar.gz) = 3035af7e15b2894069753975d953fa15a86d968103913dbf8ce4b8aa26231644
>+SIZE (openvenues-libpostal-v1.0.0_GH0.tar.gz) = 5537587
>
>Property changes on: devel/libpostal/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/files/patch-configure.ac
>===================================================================
>--- devel/libpostal/files/patch-configure.ac	(nonexistent)
>+++ devel/libpostal/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2017-04-07 21:40:27 UTC
>++++ configure.ac
>+@@ -19,6 +19,8 @@ AC_CONFIG_HEADERS([config.h])
>+ AC_PROG_CC_C99
>+ AC_PROG_INSTALL
>+ 
>++CFLAGS="$CFLAGS -I/usr/local/include"
>++CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
>+ 
>+ # Checks for libraries.
>
>Property changes on: devel/libpostal/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/files/patch-src_Makefile.am
>===================================================================
>--- devel/libpostal/files/patch-src_Makefile.am	(nonexistent)
>+++ devel/libpostal/files/patch-src_Makefile.am	(working copy)
>@@ -0,0 +1,19 @@
>+--- src/Makefile.am.orig	2017-04-07 21:40:27 UTC
>++++ src/Makefile.am
>+@@ -1,6 +1,6 @@
>+ # Inherited from autoconf / user-specified
>+ CFLAGS_CONF = @CFLAGS@
>+-CFLAGS_BASE = -Wall -Wextra -Wno-unused-function -Wformat -Werror=format-security -Winit-self -Wno-sign-compare -DLIBPOSTAL_DATA_DIR='"$(datadir)/libpostal"' -g $(CFLAGS_CONF)
>++CFLAGS_BASE = -Wall -Wextra -Wno-unused-function -Wformat -Werror=format-security -Winit-self -Wno-sign-compare -DLIBPOSTAL_DATA_DIR='"$(datadir)"' -g $(CFLAGS_CONF)
>+ CFLAGS_O0 = $(CFLAGS_BASE) -O0
>+ CFLAGS_O1 = $(CFLAGS_BASE) -O1
>+ CFLAGS_O2 = $(CFLAGS_BASE) -O2
>+@@ -67,7 +67,7 @@ pkginclude_HEADERS = libpostal.h
>+ 
>+ if DOWNLOAD_DATA
>+ all-local:
>+-	${srcdir}/libpostal_data download all $(datadir)/libpostal
>++	${srcdir}/libpostal_data download all $(datadir)
>+ endif
>+ 
>+ lexer: scanner.re
>
>Property changes on: devel/libpostal/files/patch-src_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/files/patch-src_libpostal__data
>===================================================================
>--- devel/libpostal/files/patch-src_libpostal__data	(nonexistent)
>+++ devel/libpostal/files/patch-src_libpostal__data	(working copy)
>@@ -0,0 +1,23 @@
>+--- src/libpostal_data.orig	2017-04-07 21:40:27 UTC
>++++ src/libpostal_data
>+@@ -78,9 +78,9 @@ download_multipart() {
>+         else
>+             max=$size;
>+         fi;
>+-        printf "%s\0%s\0%s\0%s\0%s\0" "$i" "$offset" "$max" "$url" "$part_filename"
>++        printf "%s\0%s\0%s\0%s\0%s\0%s\0%s\0" "x" "$i" "$offset" "$max" "$url" "$part_filename"
>+         offset=$((offset+CHUNK_SIZE))
>+-    done | xargs -0 -n 5 -P $NUM_WORKERS sh -c "$DOWNLOAD_PART" --
>++    done | xargs -0 -n 6 -P $NUM_WORKERS sh -c "$DOWNLOAD_PART" --
>+ 
>+     > $local_path
>+ 
>+@@ -176,6 +176,8 @@ if [ $COMMAND = "download" ]; then
>+         download_file $LIBPOSTAL_LANG_CLASS_UPDATED_PATH $LIBPOSTAL_DATA_DIR $lang_class_s3_prefix $LIBPOSTAL_LANG_CLASS_FILE "language classifier data file" $LANGUAGE_CLASSIFIER_MODULE_DIR
>+     fi
>+ 
>++    chown -R root:wheel $LIBPOSTAL_DATA_DIR
>++
>+     if [ "$LIBPOSTAL_DATA_DIR_VERSION" != "$LIBPOSTAL_VERSION_STRING" ]; then
>+         echo $LIBPOSTAL_VERSION_STRING > $LIBPOSTAL_DATA_VERSION_FILE;
>+     fi
>
>Property changes on: devel/libpostal/files/patch-src_libpostal__data
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/files/patch-test_Makefile.am
>===================================================================
>--- devel/libpostal/files/patch-test_Makefile.am	(nonexistent)
>+++ devel/libpostal/files/patch-test_Makefile.am	(working copy)
>@@ -0,0 +1,8 @@
>+--- test/Makefile.am.orig	2017-12-11 22:39:43 UTC
>++++ test/Makefile.am
>+@@ -1,4 +1,4 @@
>+-CFLAGS_BASE = -Wfloat-equal -Wpointer-arith -std=gnu99 -DLIBPOSTAL_DATA_DIR='"$(datadir)/libpostal"' -g
>++CFLAGS_BASE = -Wfloat-equal -Wpointer-arith -std=gnu99 -DLIBPOSTAL_DATA_DIR='"$(datadir)"' -g
>+ CFLAGS_O0 = $(CFLAGS_BASE) -O0
>+ CFLAGS_O1 = $(CFLAGS_BASE) -O1
>+ CFLAGS_O2 = $(CFLAGS_BASE) -O2
>
>Property changes on: devel/libpostal/files/patch-test_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/files/pkg-message.in
>===================================================================
>--- devel/libpostal/files/pkg-message.in	(nonexistent)
>+++ devel/libpostal/files/pkg-message.in	(working copy)
>@@ -0,0 +1,4 @@
>+%%PORTNAME%% requires model data (about 1.5GB) which can be downloaded using
>+the following command:
>+
>+# %%PREFIX%%/bin/libpostal_data download all %%LIBPOSTAL_DATADIR%%
>
>Property changes on: devel/libpostal/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/pkg-descr
>===================================================================
>--- devel/libpostal/pkg-descr	(nonexistent)
>+++ devel/libpostal/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+C library for parsing/normalizing street addresses around the world, powered
>+by statistical NLP and open geo data. This library helps convert the
>+free-form addresses that humans use into clean normalized forms suitable for
>+machine comparison and full-text indexing.
>+
>+WWW: https://github.com/openvenues/libpostal
>
>Property changes on: devel/libpostal/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libpostal/pkg-plist
>===================================================================
>--- devel/libpostal/pkg-plist	(nonexistent)
>+++ devel/libpostal/pkg-plist	(working copy)
>@@ -0,0 +1,9 @@
>+bin/address_parser
>+bin/libpostal
>+bin/libpostal_data
>+include/libpostal/libpostal.h
>+lib/libpostal.a
>+lib/libpostal.so
>+lib/libpostal.so.1
>+lib/libpostal.so.1.0.0
>+libdata/pkgconfig/libpostal.pc
>
>Property changes on: devel/libpostal/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224262: 188741 | 188805