3 files changed, 60 insertions, 11 deletions

diff --git a/cad/ldraw/Makefile b/cad/ldraw/Makefile
index 3c5230a0b854..e35e791044cb 100644
--- a/cad/ldraw/Makefile
+++ b/cad/ldraw/Makefile
@@ -1,30 +1,68 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	ldraw
-PORTVERSION=	20120913
+PORTVERSION=	201301
+PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ldraw.org/library/updates/
 DISTNAME=	complete
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	LDraw parts library
 
-LICENSE=	CDDL
+LICENSE=	CDDL CCbyNCSA2
+LICENSE_COMB=	dual
+LICENSE_NAME_CCbyNCSA2=Attribution-NonCommercial-ShareAlike 2.0 Unported
+LICENSE_FILE_CCbyNCSA2=${WRKSRC}/CAlicense.txt
+LICENSE_PERMS_CCbyNCSA2=dist-mirror pkg-mirror auto-accept
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-BROKEN=		Unfetchable due to checksum mismatch
 USE_ZIP=	yes
-NO_BUILD=	yes
+USES=		gmake
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+PORTDOCS=	Readme.txt
+
+OPTIONS_DEFINE=	DOCS
+
+SUB_FILES=	pkg-message
+
+.include <bsd.port.options.mk>
+
+post-extract-script:
+	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo -d ${WRKSRC}/mklist1_4 ${WRKSRC}/mklist1_4.zip)
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CC=gcc|CC?=gcc|' \
+		-e 's|CFLAGS=|CFLAGS?=|' \
+		${WRKSRC}/mklist1_4/makefile
+	@${REINPLACE_CMD} -e 's|PARTS|parts|' \
+		${WRKSRC}/mklist1_4/mklist.c
+
+do-build:
+	@(cd ${WRKSRC}/mklist1_4 ; ${GMAKE} ${MAKE_ENV})
 
 do-install:
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
+.for f in models p parts LDCfgalt.ldr LDConfig.ldr LDConfig_TLG.ldr
+	@(cd ${WRKSRC} ; ${COPYTREE_SHARE} ${f} ${DATADIR})
+.endfor
+
+	${INSTALL_SCRIPT} ${WRKSRC}/mklist1_4/mklist ${DATADIR}
+	@(cd ${DATADIR} ; ./mklist -n)
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
-post-install:
 	@${FIND} ${DATADIR}/ ! -type d | ${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
 	@${FIND} -ds ${DATADIR}/ -type d | \
 		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
 
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+
 .include <bsd.port.mk>
diff --git a/cad/ldraw/distinfo b/cad/ldraw/distinfo
index b02fb8bdf2e0..17b58b11b6b2 100644
--- a/cad/ldraw/distinfo
+++ b/cad/ldraw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldraw/complete.zip) = d6949e51f617ff46457dc5467d9b8d525cf744486ff9f29a49927f6eaa882b79
-SIZE (ldraw/complete.zip) = 21433103
+SHA256 (ldraw/complete.zip) = 504b27731cb7d7b83833dff2ca0bd711363f733751d4f3dc6fec6ef86f54d916
+SIZE (ldraw/complete.zip) = 22915441
diff --git a/cad/ldraw/files/pkg-message.in b/cad/ldraw/files/pkg-message.in
new file mode 100644
index 000000000000..4e5e0a483ad8
--- /dev/null
+++ b/cad/ldraw/files/pkg-message.in
@@ -0,0 +1,11 @@
+===============================================================================
+
+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.
+
+===============================================================================