- Update LibreDWG to version 0.12

- Disable Perl bindings for now (there are issues)
- Add missing bits for the proper Python support
- Install examples (and put them where they belong)

4 files changed, 54 insertions, 7 deletions

diff --git a/cad/libredwg/Makefile b/cad/libredwg/Makefile
index e6bf221954a4..83dcc3aca745 100644
--- a/cad/libredwg/Makefile
+++ b/cad/libredwg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libredwg
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12
 CATEGORIES=	cad devel
 MASTER_SITES=	GNU
 
@@ -13,16 +13,18 @@ LICENSE=	GPLv3+
 
 USES=		libtool tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-trace
+CONFIGURE_ARGS=	--enable-trace --with-perl-install=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 INFO=		LibreDWG
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTEXAMPLES=	dwgadd.example
 
-OPTIONS_DEFINE=	DOCS PCRE PSLIB PYTHON
+OPTIONS_DEFINE=	DOCS EXAMPLES PCRE PSLIB PYTHON
 OPTIONS_DEFAULT=	PCRE PSLIB
+OPTIONS_SUB=	yes
 PCRE_DESC=	Regular expressions support in dwggrep
 PSLIB_DESC=	PostScript export support (dwg2ps)
 
@@ -35,7 +37,11 @@ PSLIB_USES=		localbase
 PSLIB_CONFIGURE_ENV_OFF=	ac_cv_lib_ps_PS_open_file=no
 PSLIB_PLIST_FILES=	bin/dwg2ps man/man1/dwg2ps.1.gz
 
+PYTHON_BUILD_DEPENDS=	swig:devel/swig
+PYTHON_USES=		gettext-runtime python:3.6+ shebangfix
 PYTHON_CONFIGURE_OFF=	--disable-python
+PYTHON_PORTEXAMPLES=	load_dwg.py
+PYTHON_VARS=		SHEBANG_FILES+=examples/load_dwg.py
 
 post-patch:
 # XXX: switch the order of #include's to unbreak on powerpc/sparc64
@@ -47,4 +53,15 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
+post-install-PYTHON-on:
+	${CHMOD} +x ${STAGEDIR}${PREFIX}/share/load_dwg.py
+
+post-install-PYTHON-off:
+	${RM} ${STAGEDIR}${PREFIX}/share/load_dwg.py
+
+post-stage:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MV} ${PORTEXAMPLES:S|^|${STAGEDIR}${PREFIX}/share/|} \
+		${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
diff --git a/cad/libredwg/distinfo b/cad/libredwg/distinfo
index a1fadf55547e..ce146e1a51d7 100644
--- a/cad/libredwg/distinfo
+++ b/cad/libredwg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605603993
-SHA256 (libredwg-0.11.1.tar.xz) = b6dd03ff30c3fcfb5b82a00176bd184b58965d7198228f2cc5bf923a99f1a6f7
-SIZE (libredwg-0.11.1.tar.xz) = 8445476
+TIMESTAMP = 1609430576
+SHA256 (libredwg-0.12.tar.xz) = a85573cd100d303e01b7e75bb80d7b87d927a4c7c017848c0998aa11ffa3aa7c
+SIZE (libredwg-0.12.tar.xz) = 9518568
diff --git a/cad/libredwg/files/patch-examples_load__dwg.py b/cad/libredwg/files/patch-examples_load__dwg.py
new file mode 100644
index 000000000000..53e0ff3700dd
--- /dev/null
+++ b/cad/libredwg/files/patch-examples_load__dwg.py
@@ -0,0 +1,20 @@
+--- examples/load_dwg.py.orig	2020-01-16 22:20:43 UTC
++++ examples/load_dwg.py
+@@ -1,7 +1,7 @@
+ #! /usr/bin/python
+ 
+ #import libredwg
+-from libredwg import *
++from LibreDWG import *
+ 
+ import sys
+ 
+@@ -15,7 +15,7 @@ a.object = new_Dwg_Object_Array(1000)
+ error = dwg_read_file(filename, a)
+ 
+ if (error > 0): # critical errors
+-    print "Error: ", error
++    print("Error: ", error)
+     if (error > 127):
+         exit()
+ 
diff --git a/cad/libredwg/pkg-plist b/cad/libredwg/pkg-plist
index 9c116d30774f..7f612d5a7df1 100644
--- a/cad/libredwg/pkg-plist
+++ b/cad/libredwg/pkg-plist
@@ -1,5 +1,6 @@
 bin/dwg2SVG
 bin/dwg2dxf
+bin/dwgadd
 bin/dwgbmp
 bin/dwgfilter
 bin/dwggrep
@@ -14,10 +15,11 @@ include/dwg_api.h
 lib/libredwg.a
 lib/libredwg.so
 lib/libredwg.so.0
-lib/libredwg.so.0.0.11
+lib/libredwg.so.0.0.12
 libdata/pkgconfig/libredwg.pc
 man/man1/dwg2SVG.1.gz
 man/man1/dwg2dxf.1.gz
+man/man1/dwgadd.1.gz
 man/man1/dwgbmp.1.gz
 man/man1/dwgfilter.1.gz
 man/man1/dwggrep.1.gz
@@ -27,3 +29,11 @@ man/man1/dwgrewrite.1.gz
 man/man1/dwgwrite.1.gz
 man/man1/dxf2dwg.1.gz
 man/man1/dxfwrite.1.gz
+man/man5/dwgadd.5.gz
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/LibreDWG.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_LibreDWG.so.0.0.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/LibreDWG.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/LibreDWG.cpython-%%PYTHON_SUFFIX%%.pyc