5 files changed, 36 insertions, 212 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 850f6cde46fd..29c7d429ea9d 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	2.0.2.0.1
+PORTVERSION=	2.0.3.1.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1/-1/}.src
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/1.1/1-1/}.src
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Professional CAD system
@@ -17,19 +17,20 @@ COMMENT=	Professional CAD system
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
 		qmake:${PORTSDIR}/devel/qmake
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1/-1/}.src
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1.1/.1-1/}.src
 
 QTDIR?=		${X11BASE}
 
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+PLIST=		${WRKDIR}/pkg-plist
 MAKE_ENV=	QTDIR="${QTDIR}" MAKE="${GMAKE}" \
 		QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${ARCH} == "alpha"
 CFLAGS+=	-O0
 .endif
 
@@ -40,19 +41,44 @@ post-patch:
 .endif
 
 do-build:
-	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${SH} ./build_qcad.sh
+	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} bash ./build_qcad.sh
+
+pre-install:
+	@${ECHO_CMD} bin/qcad > ${PLIST}
+	@${ECHO_CMD} '@exec mkdir -p %D/share/qcad/libraries' >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/doc/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:%%PORTDOCS%%share/:g" >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/examples/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:%%PORTDOCS%%share/:g" >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/fonts/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/patterns/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/qm/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST}
+	@${FIND} ${WRKSRC}/qcad/scripts/ -type f | \
+		${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST}
+	@${ECHO_CMD} '%%PORTDOCS%%@dirrm share/qcad/doc' >> ${PLIST}
+	@${ECHO_CMD} '%%PORTDOCS%%@dirrm share/qcad/examples' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad/libraries' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad/fonts' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad/patterns' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad/scripts/python' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad/scripts' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm share/qcad' >> ${PLIST}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin/qcad
-	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/libraries
 .for dir in fonts patterns qm scripts
 	${TAR} -C ${WRKSRC}/qcad --exclude CVS -cf - ${dir} | \
 		${TAR} -C ${DATADIR} --unlink -xf -
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/qcad/examples/* ${EXAMPLESDIR}
+.for dir in doc examples
+	${TAR} -C ${WRKSRC}/qcad --exclude CVS -cf - ${dir} | \
+		${TAR} -C ${DATADIR} --unlink -xf -
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index aa47ba4467d8..66c790329bc4 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,2 +1,2 @@
-MD5 (qcad-2.0.2.0-1.src.tar.gz) = 2ab7cd5d2fd1ae1c9c93f9b6327ac8e4
-SIZE (qcad-2.0.2.0-1.src.tar.gz) = 5028132
+MD5 (qcad-2.0.3.1-1.src.tar.gz) = d5c87f9a416657e20da94e21dc6d4245
+SIZE (qcad-2.0.3.1-1.src.tar.gz) = 4680992
diff --git a/cad/qcad/files/patch-ag b/cad/qcad/files/patch-ag
deleted file mode 100644
index 10139bd97c2a..000000000000
--- a/cad/qcad/files/patch-ag
+++ /dev/null
@@ -1,35 +0,0 @@
---- dxflib/src/dl_entities.h.org	Wed Dec 10 20:06:25 2003
-+++ dxflib/src/dl_entities.h	Wed Dec 10 20:06:50 2003
-@@ -1128,10 +1128,6 @@
-      */
-     bool defined;
- 
--#ifndef __GCC2x__
--    union {
--        struct {
--#endif
-             /*! Start point (X). */
-             double x1;
-             /*! Start point (Y). */
-@@ -1140,10 +1136,6 @@
-             double x2;
-             /*! End point (Y). */
-             double y2;
--#ifndef __GCC2x__
--        };
--        struct {
--#endif
-             /*! Center point of arc (X). */
-             double cx;
-             /*! Center point of arc (Y). */
-@@ -1156,10 +1148,6 @@
-             double angle2;
-             /*! Counterclockwise flag. */
-             bool ccw;
--#ifndef __GCC2x__
--        };
--    };
--#endif
- 
- };
- 
diff --git a/cad/qcad/files/patch-qcadguiqt+src+ui+qg_commandwidget.ui.h b/cad/qcad/files/patch-qcadguiqt+src+ui+qg_commandwidget.ui.h
deleted file mode 100644
index c422b77b31ee..000000000000
--- a/cad/qcad/files/patch-qcadguiqt+src+ui+qg_commandwidget.ui.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- qcadguiqt/src/ui/qg_commandwidget.ui.h.orig	Mon Feb  9 18:16:26 2004
-+++ qcadguiqt/src/ui/qg_commandwidget.ui.h	Mon Feb  9 18:17:27 2004
-@@ -130,5 +130,5 @@
-     std::string s = errBuf.str();
-     if (s.length()!=0) {
--        appendHistory(QString("%1").arg(s));
-+        appendHistory(QString("%1").arg(s.c_str()));
-     }
-     //std::cout << "processStderr: OK\n";
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
deleted file mode 100644
index aaaef8cea5c3..000000000000
--- a/cad/qcad/pkg-plist
+++ /dev/null
@@ -1,158 +0,0 @@
-bin/qcad
-%%PORTDOCS%%share/examples/qcad/example00.dxf
-%%PORTDOCS%%share/examples/qcad/example01.dxf
-%%PORTDOCS%%share/examples/qcad/example02.dxf
-%%PORTDOCS%%share/examples/qcad/example03.dxf
-%%PORTDOCS%%share/examples/qcad/example04.dxf
-%%PORTDOCS%%share/examples/qcad/example04.png
-@exec mkdir -p %D/share/qcad/libraries
-
-share/qcad/fonts/symbol_astro.cxf
-share/qcad/fonts/symbol.cxf
-share/qcad/fonts/gothgrt.cxf
-share/qcad/fonts/kochigothic.cxf
-share/qcad/fonts/cyrillic_ii.cxf
-share/qcad/fonts/gothitt.cxf
-share/qcad/fonts/symbol_misc1.cxf
-share/qcad/fonts/symbol_misc2.cxf
-share/qcad/fonts/normallatin1.cxf
-share/qcad/fonts/normallatin2.cxf
-share/qcad/fonts/standard.cxf
-share/qcad/fonts/italicc.cxf
-share/qcad/fonts/italict.cxf
-share/qcad/fonts/normal.cxf
-share/qcad/fonts/cursive.cxf
-share/qcad/fonts/scriptc.cxf
-share/qcad/fonts/scripts.cxf
-share/qcad/fonts/romancs.cxf
-share/qcad/fonts/greekc.cxf
-share/qcad/fonts/unicode.cxf
-share/qcad/fonts/greekp.cxf
-share/qcad/fonts/greeks.cxf
-share/qcad/fonts/normallatin1.readme
-share/qcad/fonts/romans2.cxf
-share/qcad/fonts/iso8859-11.cxf
-share/qcad/fonts/italiccs.cxf
-share/qcad/fonts/kochimincho.cxf
-share/qcad/fonts/hershey.readme
-share/qcad/fonts/gothgbt.cxf
-share/qcad/fonts/greekcs.cxf
-share/qcad/fonts/greek_ol.cxf
-share/qcad/fonts/romanc.cxf
-share/qcad/fonts/romand.cxf
-share/qcad/fonts/courier.cxf
-share/qcad/fonts/unicode2.cxf
-share/qcad/fonts/romanp.cxf
-share/qcad/fonts/romans.cxf
-share/qcad/fonts/romant.cxf
-share/qcad/patterns/sacncr.dxf
-share/qcad/patterns/paisley.dxf
-share/qcad/patterns/sand.dxf
-share/qcad/patterns/brstone.dxf
-share/qcad/patterns/ansi31.dxf
-share/qcad/patterns/ar-b816c.dxf
-share/qcad/patterns/ar-parq1.dxf
-share/qcad/patterns/hound.dxf
-share/qcad/patterns/ar-b88.dxf
-share/qcad/patterns/grass_b.dxf
-share/qcad/patterns/honeycomb.dxf
-share/qcad/patterns/misc01.dxf
-share/qcad/patterns/misc02.dxf
-share/qcad/patterns/misc03.dxf
-share/qcad/patterns/iso03w100a.dxf
-share/qcad/patterns/ar-b816.dxf
-share/qcad/patterns/square.dxf
-share/qcad/patterns/cross.dxf
-share/qcad/patterns/daemon.dxf
-share/qcad/patterns/plastic.dxf
-share/qcad/patterns/ar-brelm.dxf
-share/qcad/patterns/dolmit.dxf
-share/qcad/patterns/angle.dxf
-share/qcad/patterns/ar-brstd.dxf
-share/qcad/patterns/arcs.dxf
-share/qcad/patterns/hex.dxf
-share/qcad/patterns/ar-rshke.dxf
-share/qcad/patterns/ar-hbone.dxf
-share/qcad/patterns/grass.dxf
-share/qcad/patterns/triangle_a.dxf
-share/qcad/patterns/triangle_b.dxf
-share/qcad/patterns/flex.dxf
-share/qcad/patterns/iso03w100.dxf
-share/qcad/patterns/concrete.dxf
-share/qcad/patterns/earth.dxf
-share/qcad/patterns/brick.dxf
-share/qcad/patterns/ar-conc.dxf
-share/qcad/patterns/arcs_2.dxf
-share/qcad/patterns/clay.dxf
-share/qcad/patterns/pantagon_a.dxf
-share/qcad/patterns/pantagon_b.dxf
-share/qcad/patterns/box.dxf
-share/qcad/patterns/ar-roof.dxf
-share/qcad/patterns/hexagon_a.dxf
-share/qcad/patterns/hexagon_b.dxf
-share/qcad/patterns/escher.dxf
-share/qcad/qm/qcadactions_da.qm
-share/qcad/qm/qcadactions_de.qm
-share/qcad/qm/qcadactions_el.qm
-share/qcad/qm/qcadactions_cs.qm
-share/qcad/qm/qcadactions_en.qm
-share/qcad/qm/qcadactions_fr.qm
-share/qcad/qm/qcadactions_it.qm
-share/qcad/qm/qcadactions_hu.qm
-share/qcad/qm/qt_de.qm
-share/qcad/qm/qt_fr.qm
-share/qcad/qm/qcadactions_nl.qm
-share/qcad/qm/qcadguiqt_el.qm
-share/qcad/qm/qcadactions_no.qm
-share/qcad/qm/qcadactions_ru.qm
-share/qcad/qm/qcadguiqt_it.qm
-share/qcad/qm/qcadcmd_hu.qm
-share/qcad/qm/qcadactions_sk.qm
-share/qcad/qm/qcadactions_tr.qm
-share/qcad/qm/qcadguiqt_da.qm
-share/qcad/qm/qcadcmd_el.qm
-share/qcad/qm/qcadguiqt_de.qm
-share/qcad/qm/qcadguiqt_cs.qm
-share/qcad/qm/qcadguiqt_en.qm
-share/qcad/qm/qcadcmd_it.qm
-share/qcad/qm/qcadguiqt_fr.qm
-share/qcad/qm/qcadguiqt_hu.qm
-share/qcad/qm/qcad_el.qm
-share/qcad/qm/qcadguiqt_nl.qm
-share/qcad/qm/qcadguiqt_no.qm
-share/qcad/qm/qcadcmd_nl.qm
-share/qcad/qm/qcad_it.qm
-share/qcad/qm/qcadguiqt_ru.qm
-share/qcad/qm/qcadguiqt_sk.qm
-share/qcad/qm/qcadguiqt_tr.qm
-share/qcad/qm/qcadcmd_da.qm
-share/qcad/qm/qcadcmd_de.qm
-share/qcad/qm/qcadcmd_cs.qm
-share/qcad/qm/qcadcmd_en.qm
-share/qcad/qm/qcadcmd_fr.qm
-share/qcad/qm/qcadcmd_no.qm
-share/qcad/qm/qcadcmd_ru.qm
-share/qcad/qm/qcadcmd_sk.qm
-share/qcad/qm/qcadcmd_tr.qm
-share/qcad/qm/qcad_da.qm
-share/qcad/qm/qcad_de.qm
-share/qcad/qm/qcad_cs.qm
-share/qcad/qm/qcad_en.qm
-share/qcad/qm/qcad_fr.qm
-share/qcad/qm/qcad_hu.qm
-share/qcad/qm/qcad_nl.qm
-share/qcad/qm/qcad_no.qm
-share/qcad/qm/qcad_ru.qm
-share/qcad/qm/qcad_sk.qm
-share/qcad/qm/qcad_tr.qm
-share/qcad/scripts/python/sine.py
-share/qcad/scripts/python/simple.py
-
-@dirrm share/qcad/libraries
-@dirrm share/qcad/fonts
-@dirrm share/qcad/patterns
-@dirrm share/qcad/qm
-@dirrm share/qcad/scripts/python
-@dirrm share/qcad/scripts
-@dirrm share/qcad
-%%PORTDOCS%%@dirrm share/examples/qcad