Fix build/work of qcad:

- minor update to 2.0.1.2
- add dependancy to bash (needed by build process)
- use {SH} instead of hardcoded sh
- delete repo copied but not used cad/qcad2

Approved by:	marcus (re)

7 files changed, 5 insertions, 216 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index d20df068edb1..5552c9d7ff53 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	2.0.1.1
+PORTVERSION=	2.0.1.2
 PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
@@ -15,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}.src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Professional CAD system
 
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-${PORTREVISION}.src
 
 QTDIR?=		${X11BASE}
@@ -39,7 +41,7 @@ CFLAGS+=	-O0
 #		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ qcad.pro
 
 do-build:
-	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} sh ./build_qcad.sh
+	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} {SH} ./build_qcad.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin/qcad
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 465d339c3689..950858a2aace 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1 +1 @@
-MD5 (qcad-2.0.1.1-1.src.tar.gz) = 77c1bc5b6d20a71bdc5b87043138779c
+MD5 (qcad-2.0.1.2-1.src.tar.gz) = 9c51cd1ddeb600f455e15de9ab93f9d3
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
deleted file mode 100644
index d20df068edb1..000000000000
--- a/cad/qcad2/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:	qcad
-# Date created:		10 Dec 1999
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qcad
-PORTVERSION=	2.0.1.1
-PORTREVISION=	1
-CATEGORIES=	cad
-MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}.src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Professional CAD system
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-${PORTREVISION}.src
-
-QTDIR?=		${X11BASE}
-
-USE_QT_VER=	3
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QTDIR}" QMAKESPEC="${X11BASE}/share/qt/mkspecs/freebsd-g++"
-
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-O0
-.endif
-
-#post-patch:
-#	@${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' ${WRKSRC}/qcad.pro
-#	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rprgdef.h
-
-#do-configure:
-#	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-#		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ qcad.pro
-
-do-build:
-	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} sh ./build_qcad.sh
-
-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}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/cad/qcad2/distinfo b/cad/qcad2/distinfo
deleted file mode 100644
index 465d339c3689..000000000000
--- a/cad/qcad2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (qcad-2.0.1.1-1.src.tar.gz) = 77c1bc5b6d20a71bdc5b87043138779c
diff --git a/cad/qcad2/files/patch-aa b/cad/qcad2/files/patch-aa
deleted file mode 100644
index 7f88345482f0..000000000000
--- a/cad/qcad2/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/build_qcad.sh.orig	Sun Oct 19 02:20:04 2003
-+++ scripts/build_qcad.sh	Sun Oct 19 02:19:32 2003
-@@ -11,6 +11,6 @@
- # suse: Qt is usually located in /usr/lib/qt3
- #
--export MAKE=make
--#export MAKE=gmake
-+#export MAKE=make
-+export MAKE=gmake
- #export QTDIR=/usr/share/qt3
- #export PATH=$PATH:$QTDIR/bin
diff --git a/cad/qcad2/pkg-descr b/cad/qcad2/pkg-descr
deleted file mode 100644
index d14622232d60..000000000000
--- a/cad/qcad2/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-What Is QCad?
-
-   QCad is a professional CAD System. With QCad you can easily construct
-   and change drawings with ISO-texts and many other features and save
-   them as DXF-files. These DXF-files are the interface to many
-   CAD-systems such as AutoCAD (c) and many others.
-
-What is QCad not?
-
-   QCad is no designer tool. That means you can not create any filled
-   shapes nor any crazy freehand forms. Also you can not drag and drop
-   the objects in the drawing with the mouse.
-
-If you find any bugs, send a report to bugs@qcad.org.
-
-WWW: http://www.qcad.org/
diff --git a/cad/qcad2/pkg-plist b/cad/qcad2/pkg-plist
deleted file mode 100644
index ad929b6ee23e..000000000000
--- a/cad/qcad2/pkg-plist
+++ /dev/null
@@ -1,128 +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/gothitt.cxf
-share/qcad/fonts/cyrillic_ol.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/cyrillic.cxf
-share/qcad/fonts/scriptc.cxf
-share/qcad/fonts/cyrilc2.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/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_en.qm
-share/qcad/qm/qcadactions_fr.qm
-share/qcad/qm/qcadactions_hu.qm
-share/qcad/qm/qcadactions_no.qm
-share/qcad/qm/qcadguiqt_da.qm
-share/qcad/qm/qcadguiqt_de.qm
-share/qcad/qm/qcadguiqt_en.qm
-share/qcad/qm/qcadguiqt_fr.qm
-share/qcad/qm/qcadguiqt_hu.qm
-share/qcad/qm/qcadguiqt_no.qm
-share/qcad/qm/qcadcmd_da.qm
-share/qcad/qm/qcadcmd_de.qm
-share/qcad/qm/qcadcmd_en.qm
-share/qcad/qm/qcadcmd_fr.qm
-share/qcad/qm/qcadcmd_hu.qm
-share/qcad/qm/qcadcmd_no.qm
-share/qcad/qm/qcad_da.qm
-share/qcad/qm/qcad_de.qm
-share/qcad/qm/qcad_en.qm
-share/qcad/qm/qcad_fr.qm
-share/qcad/qm/qcad_hu.qm
-share/qcad/qm/qcad_no.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