diff options
| -rw-r--r-- | cad/boolean/Makefile | 23 | ||||
| -rw-r--r-- | cad/boolean/PLIST | 12 | ||||
| -rw-r--r-- | cad/boolean/distinfo | 11 | ||||
| -rw-r--r-- | cad/boolean/patches/patch-aa | 15 |
4 files changed, 35 insertions, 26 deletions
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile index 7787aff7d53..af32a92787a 100644 --- a/cad/boolean/Makefile +++ b/cad/boolean/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2005/08/07 11:42:06 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/18 23:52:14 dmcmahill Exp $ # -DISTNAME= boolean +DISTNAME= boolean_6_7 PKGNAME= boolean-${REL} -PKGREVISION= 7 CATEGORIES= cad graphics MASTER_SITES= http://www.xs4all.nl/~kholwerd/download/boolzip/ EXTRACT_SUFX= .zip @@ -13,11 +12,13 @@ HOMEPAGE= http://www.xs4all.nl/~kholwerd/bool.html COMMENT= GDSII viewer/editor + (boolean) operations on sets of 2d polygons DIST_SUBDIR= ${PKGNAME_NOREV} -REL= 6.4 +REL= 6.7 BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake -USE_TOOLS+= gmake +WRKSRC= ${WRKDIR}/boolean + +USE_TOOLS+= gmake pkg-config tar INSTALLATION_DIRS= bin @@ -29,19 +30,25 @@ post-patch: n="$$d/CMakeLists.txt" ; \ ${ECHO} "$$f -> $$n" ; \ ${MV} $$f $$n ; done + ${MV} ${WRKSRC}/bin/checkmsvc.cmake ${WRKSRC}/bin/CheckMSVC.cmake + ${MV} ${WRKSRC}/bin/findpkgconfig.cmake ${WRKSRC}/bin/FindPkgConfig.cmake + ${MV} ${WRKSRC}/bin/findwxwin.cmake ${WRKSRC}/bin/FindwxWin.cmake + ${MV} ${WRKSRC}/bin/macros.cmake ${WRKSRC}/bin/Macros.cmake ${MV} -f ${WRKSRC}/bin/boolean ${WRKSRC}/bin/boolean.bak ${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/bin/boolean.bak > \ ${WRKSRC}/bin/boolean + ${CP} -f ${WRKSRC}/apps/edit/include/valuesvc.h ${WRKSRC}/modules/kbool/include do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake . + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \ + -DWXWIDGET_GTK2=YES . do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/boolean cd ${WRKSRC}/apps/edit && \ - tar cf - default gdsuser | tar -xvf - -C ${PREFIX}/share/boolean + ${TAR} cf - default gdsuser | ${TAR} -xvf - -C ${PREFIX}/share/boolean cd ${WRKSRC}/docs && \ - tar cf - html | tar -xvf - -C ${PREFIX}/share/boolean + ${TAR} cf - html | ${TAR} -xvf - -C ${PREFIX}/share/boolean ${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/share/boolean ${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean ${PREFIX}/bin/boolean ${INSTALL_PROGRAM} ${WRKSRC}/apps/edit/edit ${PREFIX}/bin/edit diff --git a/cad/boolean/PLIST b/cad/boolean/PLIST index 1a90403efcd..2cb744b3745 100644 --- a/cad/boolean/PLIST +++ b/cad/boolean/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/05/15 23:02:05 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $ bin/boolean bin/edit share/boolean/default/config/boolean.ad @@ -6,18 +6,20 @@ share/boolean/default/config/default.set share/boolean/default/config/gdsapp.cfg share/boolean/default/config/gdsapp.dos share/boolean/default/config/history.set -share/boolean/default/data/32899002.03m share/boolean/default/data/33375151.cal share/boolean/default/data/aaaaa.key -share/boolean/default/data/aaaaaaaabox.key share/boolean/default/data/aaaaaimage.key share/boolean/default/data/aaaaap.cal share/boolean/default/data/aap.cal share/boolean/default/data/albert.cal +share/boolean/default/data/bbbb.key +share/boolean/default/data/bbbb2.key share/boolean/default/data/bignext.cal share/boolean/default/data/bigtest.cal share/boolean/default/data/bigtest2.cal +share/boolean/default/data/bigtest2l.key share/boolean/default/data/bigthree.cal +share/boolean/default/data/bigthree.key share/boolean/default/data/boog.key share/boolean/default/data/boog2.key share/boolean/default/data/boog3.key @@ -57,6 +59,7 @@ share/boolean/default/data/lev.cal share/boolean/default/data/lev2.cal share/boolean/default/data/lev3.cal share/boolean/default/data/m782506.cal +share/boolean/default/data/m782506.key share/boolean/default/data/one.cal share/boolean/default/data/one.key share/boolean/default/data/oops.key @@ -206,8 +209,7 @@ share/boolean/default/process/tworec.prs share/boolean/default/process/tworec2.prs share/boolean/default/process/vijf.prs share/boolean/default/process/wil1.prs -share/boolean/gdsuser/6.1_version -share/boolean/gdsuser/6.3_version +share/boolean/gdsuser/6.6_version share/boolean/gdsuser/config/gdsapp.cfg share/boolean/gdsuser/config/history.set share/boolean/gdsuser/config/user.set diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo index 5b5117adb14..34171ffb874 100644 --- a/cad/boolean/distinfo +++ b/cad/boolean/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 14:59:23 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/08/18 23:52:14 dmcmahill Exp $ -SHA1 (boolean-6.4/boolean.zip) = 809e4126c3139a10b5c5905e17766a62fcb01f89 -RMD160 (boolean-6.4/boolean.zip) = 701cdb0751087d6665eb043268462bf89447d51c -Size (boolean-6.4/boolean.zip) = 2716249 bytes -SHA1 (patch-aa) = 220f54da8e5fe76c498c03e6ba19fdfa299ca18e +SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3 +RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d +Size (boolean-6.7/boolean_6_7.zip) = 3841104 bytes +SHA1 (patch-aa) = d2287a7271b7aa0a50b1ef9d87bf5e5ba8a6db6e +SHA1 (patch-ab) = 79e7c998362f0ab6e766207e376b5ff53abd2cab diff --git a/cad/boolean/patches/patch-aa b/cad/boolean/patches/patch-aa index e36533cac7e..a070a4fd22c 100644 --- a/cad/boolean/patches/patch-aa +++ b/cad/boolean/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2003/05/15 23:02:06 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $ ---- bin/boolean.orig Thu Nov 28 13:49:06 2002 -+++ bin/boolean -@@ -1,7 +1,6 @@ +--- bin/boolean.orig 2005-03-04 14:23:04.000000000 +0000 ++++ bin/boolean 2005-08-11 12:11:15.000000000 +0000 +@@ -1,6 +1,5 @@ #! /bin/sh -PATH=/opt/protools/boolean/6.3/boolean/apps/edit:$PATH @@ -10,17 +10,16 @@ $NetBSD: patch-aa,v 1.2 2003/05/15 23:02:06 dmcmahill Exp $ +GDSROOT=@prefix@/share/boolean export GDSROOT - echo "boolean operation program" -@@ -12,9 +11,9 @@ if test ! -d ${HOME}/gdsuser ; then +@@ -12,8 +11,8 @@ cp -r $GDSROOT/gdsuser $HOME else - if test ! -f ${HOME}/gdsuser/6.3_version ; then +- if test ! -f ${HOME}/gdsuser/6.3_version ; then - echo copying gdsuser to your HOME directory because the one there is too old - rm -r ${HOME}/gdsuser - cp -r $GDSROOT/gdsuser $HOME ++ if test ! -f ${HOME}/gdsuser/6.6_version ; then + echo "The files in your $HOME/gdsuser directory are not recent enough." + echo "Please remove this directory and run this program again." + echo "A new set of files will be installed to $HOME/gdsuer." fi fi - |