cad/ldraw: Update 201501 -> 20181208

PR:		237961

5 files changed, 30 insertions, 82 deletions

diff --git a/cad/ldraw/Makefile b/cad/ldraw/Makefile
index 982e76d46999..03d5ba14d464 100644
--- a/cad/ldraw/Makefile
+++ b/cad/ldraw/Makefile
@@ -2,56 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	ldraw
-PORTVERSION=	201501
+DISTVERSION=	20181208
 PORTEPOCH=	1
 CATEGORIES=	cad
-MASTER_SITES=	http://www.ldraw.org/library/updates/
-DISTNAME=	complete
-DIST_SUBDIR=	ldraw/${PORTVERSION}
+MASTER_SITES=	https://www.ldraw.org/library/updates/:parts \
+		https://www.ldraw.org/library/official/:config
+DISTFILES=	complete.zip:parts LDConfig.ldr:config
+DIST_SUBDIR=	${DISTNAME}-${DISTVERSION}
+EXTRACT_ONLY=	complete.zip
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	LDraw parts library
+COMMENT=	LDraw-format CAD files representing many of LEGO bricks produced
 
-LICENSE=	CDDL CC-BY-NC-SA-2.0
-LICENSE_COMB=	dual
-LICENSE_FILE_CC-BY-NC-SA-2.0=	${WRKSRC}/CAlicense.txt
+LICENSE=	CC-BY-2.0
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		zip
 
-USES=		dos2unix gmake zip:infozip
-DOS2UNIX_GLOB=	*.h makefile mklist.c *.txt *.dat
-
-PORTDATA=	*
-PORTDOCS=	Readme.txt
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	pkg-message
-
-BUILD_WRKSRC=	${WRKSRC}/mklist
-MAKEFILE=	makefile
-
-post-extract-script:
-	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo -d \
-		${WRKSRC}/mklist ${WRKSRC}/mklist1_6.zip)
-	@(cd ${WRKSRC}/mklist/include && ${MV} * ..)
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|CC=gcc|CC?=gcc|' \
-		-e 's|CFLAGS=|CFLAGS?=|' \
-		${WRKSRC}/mklist/makefile
-	@${REINPLACE_CMD} -e 's|PARTS|parts|' \
-		${WRKSRC}/mklist/mklist.c
+NO_BUILD=	yes
+NO_ARCH=	yes
 
 do-install:
-.for f in models p parts LDCfgalt.ldr LDConfig.ldr LDConfig_TLG.ldr
-	@(cd ${WRKSRC} ; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DATADIR})
-.endfor
-
-	${INSTALL_PROGRAM} ${WRKSRC}/mklist/mklist ${STAGEDIR}${DATADIR}
-	@(cd ${STAGEDIR}${DATADIR} && ./mklist -d)
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ldraw
+	cd ${WRKDIR}/ldraw && \
+		${COPYTREE_SHARE} p ${STAGEDIR}${PREFIX}/share/ldraw && \
+		${COPYTREE_SHARE} parts ${STAGEDIR}${PREFIX}/share/ldraw
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LDConfig.ldr ${STAGEDIR}${PREFIX}/share/ldraw
+
+post-install: # autoplist: ~16k files all under share/ldraw
+	@cd ${STAGEDIR}${PREFIX} && \
+		${FIND} * -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/cad/ldraw/distinfo b/cad/ldraw/distinfo
index 9179b5505aa9..34c66ccaeab4 100644
--- a/cad/ldraw/distinfo
+++ b/cad/ldraw/distinfo
@@ -1,2 +1,5 @@
-SHA256 (ldraw/201501/complete.zip) = ca4cf9c46f7fc73d0d1a55ca8270635cfe93ab2244c88640457090887e07ed7a
-SIZE (ldraw/201501/complete.zip) = 29881376
+TIMESTAMP = 1558146584
+SHA256 (ldraw-20181208-20181208/complete.zip) = 9cef56049350b67c1d625033833a617146d0f42f4be08f34f4c51e59eca84afc
+SIZE (ldraw-20181208-20181208/complete.zip) = 41548599
+SHA256 (ldraw-20181208-20181208/LDConfig.ldr) = 23a3a675b11f427afc0031df18949528dccfd92a7c2e652ced33e130eb81a1d7
+SIZE (ldraw-20181208-20181208/LDConfig.ldr) = 29466
diff --git a/cad/ldraw/files/patch-mklist__mklist.c b/cad/ldraw/files/patch-mklist__mklist.c
deleted file mode 100644
index 2bf6bd7a445f..000000000000
--- a/cad/ldraw/files/patch-mklist__mklist.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./mklist/mklist.c.orig	2013-11-15 20:23:32.000000000 +0100
-+++ ./mklist/mklist.c	2013-11-15 20:25:12.000000000 +0100
-@@ -53,8 +53,8 @@
- /*****************************************************************/
- /* Filename length compatibility stuff */
- /*****************************************************************/
--#ifndef _MAX_PATH
--#define _MAX_PATH 256
-+#ifndef MAX_PATH
-+#define MAX_PATH 256
- #endif
- char    shortfilepath[MAX_PATH];
- char    shortfilename[MAX_PATH];
-@@ -84,7 +84,7 @@
- int GetShortPathName(char *longpath, char * shortpath, int psize)
- {
-     strncpy(shortpath, longpath, psize);
--    return(strlen(shortpath);
-+    return(strlen(shortpath));
- }
- #endif
- 
diff --git a/cad/ldraw/files/pkg-message.in b/cad/ldraw/files/pkg-message.in
deleted file mode 100644
index 4e5e0a483ad8..000000000000
--- a/cad/ldraw/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-===============================================================================
-
-LDraw has been installed.
-
-You can make parts.lst with
-
-    %%DATADIR%%/mklist -h
-
-Default is sorted by Description parts.lst (mklist -d). You can change this.
-
-===============================================================================
diff --git a/cad/ldraw/pkg-descr b/cad/ldraw/pkg-descr
index 30e49a97c544..2d6163d3581e 100644
--- a/cad/ldraw/pkg-descr
+++ b/cad/ldraw/pkg-descr
@@ -1,8 +1,8 @@
-LDraw is an open standard for LEGO CAD programs that allow the user to create
+LDraw-TM is an open standard for LEGO CAD programs that allow the user to create
 virtual LEGO models and scenes. You can use it to document models you have
 physically built, create building instructions just like LEGO, render 3D photo
-realistic images of your virtual models and even make animations.
-The possibilities are endless. Unlike real LEGO bricks where you are limited by
-the number of parts and colors, in LDraw nothing is impossible.
+realistic images of your virtual models and even make animations. The
+possibilities are endless. Unlike real LEGO bricks where you are limited by the
+number of parts and colors, in LDraw nothing is impossible.
 
-WWW: http://www.ldraw.org/
+WWW: https://www.ldraw.org/