From a030267e37f59872ff87308f07a4f23fae80d1ff Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Sat, 18 Aug 2012 06:58:15 +0000
Subject: Update to 1.0.2

* Use shells/bash for post preparation script

Changelog:
unknown
---
 cad/librecad/Makefile                              | 17 ++++++++---------
 cad/librecad/distinfo                              | 10 +++++-----
 .../patches/patch-scripts_postprocess-unix.sh      | 22 ++++++++--------------
 3 files changed, 21 insertions(+), 28 deletions(-)

(limited to 'cad/librecad')

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index a8702423340..7f27553762e 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2012/07/02 13:37:36 adam Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/18 06:58:15 ryoon Exp $
 #
 
-DISTNAME=	LibreCAD-LibreCAD-v1.0.0-0-g22839a7
-PKGNAME=	librecad-1.0.0
-PKGREVISION=	4
+DISTNAME=	LibreCAD-LibreCAD-v1.0.2-0-ga6826ad
+PKGNAME=	librecad-1.0.2
 CATEGORIES=	cad
-MASTER_SITES=	-https://github.com/LibreCAD/LibreCAD/zipball/v1.0.0
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	-https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://librecad.org/
@@ -19,11 +17,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # over HTTPS and "curl" is the only fetch program which always supports HTTPS.
 FETCH_USING=	curl
 
-WRKSRC=		${WRKDIR}/LibreCAD-LibreCAD-2d7f866
+WRKSRC=		${WRKDIR}/LibreCAD-LibreCAD-a5c34b2
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	pax
+USE_TOOLS+=	bash pax
 
-REPLACE_SH=	scripts/postprocess-unix.sh
+REPLACE_BASH=	scripts/postprocess-unix.sh
 
 SUBST_CLASSES+=		qtdir
 SUBST_STAGE.qtdir=	pre-configure
@@ -52,6 +50,7 @@ do-install:
 		${DESTDIR}${PREFIX}/${LIBRECADDIR}
 
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../math/muparser/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index e79787aff75..c9919be246e 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/01/26 21:43:23 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2012/08/18 06:58:15 ryoon Exp $
 
-SHA1 (LibreCAD-LibreCAD-v1.0.0-0-g22839a7.zip) = bbf890a641c66856231024e4d957f21c80cdbf22
-RMD160 (LibreCAD-LibreCAD-v1.0.0-0-g22839a7.zip) = ecb8e1e3d9559009fdd47d39467cc0a580d975c1
-Size (LibreCAD-LibreCAD-v1.0.0-0-g22839a7.zip) = 5629971 bytes
-SHA1 (patch-scripts_postprocess-unix.sh) = 4c0b153fa1cf59d6a0070c56b0d976ca25fe89b9
+SHA1 (LibreCAD-LibreCAD-v1.0.2-0-ga6826ad.tar.gz) = 83ebe4c5536c504904020ff6ff004cab68d1a41e
+RMD160 (LibreCAD-LibreCAD-v1.0.2-0-ga6826ad.tar.gz) = 51f940a5b62ec88785665a7ed20716fbd32ebfd3
+Size (LibreCAD-LibreCAD-v1.0.2-0-ga6826ad.tar.gz) = 4577653 bytes
+SHA1 (patch-scripts_postprocess-unix.sh) = 265317f3fc26c09fec025d65242657f60e283155
diff --git a/cad/librecad/patches/patch-scripts_postprocess-unix.sh b/cad/librecad/patches/patch-scripts_postprocess-unix.sh
index c3b257a3c86..bfce8806386 100644
--- a/cad/librecad/patches/patch-scripts_postprocess-unix.sh
+++ b/cad/librecad/patches/patch-scripts_postprocess-unix.sh
@@ -1,31 +1,25 @@
-$NetBSD: patch-scripts_postprocess-unix.sh,v 1.1.1.1 2012/01/26 21:43:23 ryoon Exp $
+$NetBSD: patch-scripts_postprocess-unix.sh,v 1.2 2012/08/18 06:58:15 ryoon Exp $
 
 * Set qt4 tools path
 * Remove GNU find option
 
---- scripts/postprocess-unix.sh.orig	2012-01-18 05:38:57.000000000 +0000
+--- scripts/postprocess-unix.sh.orig	2012-04-15 20:54:52.000000000 +0000
 +++ scripts/postprocess-unix.sh
-@@ -7,7 +7,7 @@ DOCDIR="`pwd`/support/doc"
+@@ -7,7 +7,7 @@ DOCDIR="${THISDIR}/support/doc"
  
  # Generate Help Files
- cd "$DOCDIR"
+ cd "{$DOCDIR}"
 -qcollectiongenerator LibreCADdoc.qhcp
 +@QTDIR@/bin/qcollectiongenerator LibreCADdoc.qhcp
  
- cd "$THISDIR"
+ cd "${THISDIR}"
  
-@@ -20,11 +20,11 @@ cp support/patterns/*.dxf $RESOURCEDIR/p
- cp support/fonts/*.lff* $RESOURCEDIR/fonts
- #cp support/doc/*.qhc $RESOURCEDIR/doc
- #cp support/doc/*.qch $RESOURCEDIR/doc
--find support/library -type d -not -path "*.svn*"  | sed s/support// | xargs -IFILES  mkdir $RESOURCEDIR/FILES
--find support/library -type f -iname *.dxf -not -path "*.svn*"  | sed s/support// | xargs -IFILES  cp support/FILES $RESOURCEDIR/FILES
-+find support/library -type d  | sed s/support// | xargs -IFILES  mkdir $RESOURCEDIR/FILES
-+find support/library -type f -iname *.dxf | sed s/support// | xargs -IFILES  cp support/FILES $RESOURCEDIR/FILES
+@@ -24,7 +24,7 @@ find support/library -type d | sed s/sup
+ find support/library -type f -iname *.dxf | sed s/support// | xargs -IFILES  cp support/FILES "${RESOURCEDIR}"/FILES
  
  # Generate translations
 -lrelease librecad.pro
 +@QTDIR@/bin/lrelease librecad.pro
- mkdir -p $RESOURCEDIR/qm
+ mkdir -p "${RESOURCEDIR}"/qm
   
  # Go into translations directory
-- 
cgit v1.2.3