pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cad/boolean Update to boolean-6.99. No changes, but su...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9001dd3a7872
branches: trunk
changeset: 397504:9001dd3a7872
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Aug 14 19:09:48 2009 +0000
description:
Update to boolean-6.99. No changes, but supports wxGTK 2.8.
diffstat:
cad/boolean/Makefile | 28 ++++++++++++++--------------
cad/boolean/PLIST | 4 ++--
cad/boolean/distinfo | 16 ++++++----------
cad/boolean/patches/patch-aa | 29 +++++++----------------------
cad/boolean/patches/patch-ab | 35 +++++++++++++----------------------
cad/boolean/patches/patch-ac | 19 -------------------
cad/boolean/patches/patch-ad | 11 -----------
cad/boolean/patches/patch-ah | 13 -------------
cad/boolean/patches/patch-ai | 13 -------------
9 files changed, 42 insertions(+), 126 deletions(-)
diffs (248 lines):
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/Makefile
--- a/cad/boolean/Makefile Fri Aug 14 17:59:51 2009 +0000
+++ b/cad/boolean/Makefile Fri Aug 14 19:09:48 2009 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2008/09/22 20:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2009/08/14 19:09:48 joerg Exp $
#
-DISTNAME= boolean_6_92
-PKGNAME= boolean-6.92
-PKGREVISION= 2
+DISTNAME= boolean_6_99
+PKGNAME= boolean-6.99
CATEGORIES= cad graphics
MASTER_SITES= http://boolean.klaasholwerda.nl/download/boolzip/
-EXTRACT_SUFX= .zip
+EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://boolean.klaasholwerda.nl/bool.html
@@ -23,25 +22,26 @@
USE_LANGUAGES= c c++
USE_CMAKE= yes
+INSTALLATION_DIRS= bin share/boolean
+
+MAKE_ENV+= wxWidgets_CONFIG_EXECUTABLE=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
+CMAKE_ARGS+= -DWXWIDGET_GTK2=YES
+
SUBST_CLASSES+= prefix
-SUBST_FILES.prefix= bin/boolean
+SUBST_FILES.prefix= bin/boolean.sh
SUBST_SED.prefix= -e 's;@prefix@;${PREFIX};g'
SUBST_STAGE.prefix= pre-configure
SUBST_MESSAGE.prefix= Fixing installation prefix.
-INSTALLATION_DIRS= bin
-
-CMAKE_ARGS+= -DWXWIDGET_GTK2=YES
-
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/boolean
cd ${WRKSRC}/apps/edit \
&& pax -rw default gdsuser ${DESTDIR}${PREFIX}/share/boolean
cd ${WRKSRC}/docs \
&& pax -rw html ${DESTDIR}${PREFIX}/share/boolean
${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/boolean
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean ${DESTDIR}${PREFIX}/bin/boolean
- ${INSTALL_PROGRAM} ${WRKSRC}/apps/edit/edit ${DESTDIR}${PREFIX}/bin/edit
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean.sh ${DESTDIR}${PREFIX}/bin/boolean
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/edit ${DESTDIR}${PREFIX}/bin/edit
-.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK28-contrib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/PLIST
--- a/cad/boolean/PLIST Fri Aug 14 17:59:51 2009 +0000
+++ b/cad/boolean/PLIST Fri Aug 14 19:09:48 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:35:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/14 19:09:48 joerg Exp $
bin/boolean
bin/edit
share/boolean/default/config/boolean.ad
@@ -212,7 +212,7 @@
share/boolean/default/process/tworec2.prs
share/boolean/default/process/vijf.prs
share/boolean/default/process/wil1.prs
-share/boolean/gdsuser/6.6_version
+share/boolean/gdsuser/6.9_version
share/boolean/gdsuser/config/gdsapp.cfg
share/boolean/gdsuser/config/history.set
share/boolean/gdsuser/config/user.set
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/distinfo
--- a/cad/boolean/distinfo Fri Aug 14 17:59:51 2009 +0000
+++ b/cad/boolean/distinfo Fri Aug 14 19:09:48 2009 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.14 2008/06/21 18:01:19 joerg Exp $
+$NetBSD: distinfo,v 1.15 2009/08/14 19:09:48 joerg Exp $
-SHA1 (boolean_6_92.zip) = c0b75d957186cb482b9a363984133e311f291c14
-RMD160 (boolean_6_92.zip) = efb5b5cd0237c5fe13cc994f89c5061b768fdd11
-Size (boolean_6_92.zip) = 4366947 bytes
-SHA1 (patch-aa) = 2bca0775e3f94bd53041c4083d9b85394bfbfae4
-SHA1 (patch-ab) = 19bf76826a67bd640451c558e8e36d830c23ebf5
-SHA1 (patch-ac) = e5f1f46d379347a1ea932a781693128c3f4ea682
-SHA1 (patch-ad) = 4bf6974f34558eddc59bdf36ed3a020f1fc81545
-SHA1 (patch-ah) = ac97179d24e009f9654dc4e1a0e87218a572fab8
-SHA1 (patch-ai) = 787bdae151487758891a2849992749dff00cf767
+SHA1 (boolean_6_99.tgz) = 03e8dc7c9aa2886b0d5663669248c507524c5b22
+RMD160 (boolean_6_99.tgz) = 7977bb140169fa15a7dde9709ba1867e763b7b9c
+Size (boolean_6_99.tgz) = 4270460 bytes
+SHA1 (patch-aa) = f2c2d15bc27941d172babbb7add4ddbeddb211df
+SHA1 (patch-ab) = d9c45fc98a82edba6e59ba1c774b73992152b072
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-aa
--- a/cad/boolean/patches/patch-aa Fri Aug 14 17:59:51 2009 +0000
+++ b/cad/boolean/patches/patch-aa Fri Aug 14 19:09:48 2009 +0000
@@ -1,28 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2007/02/23 16:42:30 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2009/08/14 19:09:49 joerg Exp $
---- bin/boolean.orig 2005-03-04 13:23:04.000000000 +0000
-+++ bin/boolean
-@@ -1,7 +1,6 @@
+--- bin/boolean.sh.orig 2007-02-27 08:54:20.000000000 +0100
++++ bin/boolean.sh
+@@ -1,7 +1,5 @@
#! /bin/sh
--PATH=/opt/protools/boolean/6.3/boolean/apps/edit:$PATH
-
--GDSROOT=/opt/protools/boolean/6.3/boolean/apps/edit
+-PATH=/opt/protools/boolean/6.6/boolean/apps/edit:$PATH
+-
+-GDSROOT=/opt/protools/boolean/6.6/boolean/apps/edit
+GDSROOT=@prefix@/share/boolean
export GDSROOT
echo "boolean operation program"
-@@ -11,10 +10,10 @@ if test ! -d ${HOME}/gdsuser ; then
- echo copying gdsuser to your HOME directory, It can be used for personal settings
- cp -r $GDSROOT/gdsuser $HOME
- else
-- 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
-
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-ab
--- a/cad/boolean/patches/patch-ab Fri Aug 14 17:59:51 2009 +0000
+++ b/cad/boolean/patches/patch-ab Fri Aug 14 19:09:48 2009 +0000
@@ -1,25 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2006/03/28 20:42:48 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2009/08/14 19:09:49 joerg Exp $
---- apps/edit/include/valuesvc.h.orig 2005-03-04 14:21:08.000000000 +0000
-+++ apps/edit/include/valuesvc.h 2005-08-11 01:52:56.000000000 +0000
-@@ -38,9 +38,10 @@
-
- #else
-
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__DragonFly__)
+--- bin/FindwxWidgets.cmake.orig 2009-08-14 18:59:11.000000000 +0200
++++ bin/FindwxWidgets.cmake
+@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
+ SET( wxWidgets_DBG "" )
- #include <math.h>
-+#include <limits.h>
-
- #include <float.h>
+ OPTION( wxWidgets_USE_MONOLITHIC "Use wxWidgets build as monolithic library" OFF)
+-OPTION( wxWidgets_USE_DEBUG "Use Debug versions of wxWidgets libraries" ON)
++OPTION( wxWidgets_USE_DEBUG "Use Debug versions of wxWidgets libraries" OFF)
+ OPTION( wxWidgets_USE_UNICODE "Use Unicode versions of wxWidgets libraries" OFF)
+-OPTION( wxWidgets_USE_SHARED "Use shared versions (.so) of wxWidgets libraries" OFF)
++OPTION( wxWidgets_USE_SHARED "Use shared versions (.so) of wxWidgets libraries" ON)
+ OPTION( wxWidgets_USE_UNIV "Use Universal versions (.so) of wxWidgets libraries" OFF)
-@@ -48,7 +49,7 @@
- #define MAXDOUBLE DBL_MAX
- #endif
- #ifndef MAXLONG
--#define MAXLONG 0x7fffffff
-+#define MAXLONG LONG_MAX
- #endif
- #else
-
+ IF( wxWidgets_USE_UNIV )
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-ac
--- a/cad/boolean/patches/patch-ac Fri Aug 14 17:59:51 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2007/02/23 16:43:17 wiz Exp $
-
-Don't define identifiers that are already macros.
-
---- modules/kbool/include/booleng.h.orig 2005-11-28 13:32:50.000000000 +0000
-+++ modules/kbool/include/booleng.h
-@@ -56,8 +56,12 @@ class KBoolLink;
- typedef long long B_INT; // 8 bytes integer
- //#define MAXB_INT LONG_LONG_MAX
- //#define MINB_INT LONG_LONG_MIN // 8 bytes integer
-+#ifndef MAXB_INT
- const B_INT MAXB_INT = (0x7fffffffffffffffLL); // 8 bytes integer
-+#endif
-+#ifndef MINB_INT
- const B_INT MINB_INT = (0x8000000000000000LL);
-+#endif
-
- #else //defined(__UNIX__) || defined(__GNUG__)
-
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-ad
--- a/cad/boolean/patches/patch-ad Fri Aug 14 17:59:51 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2008/06/21 18:01:19 joerg Exp $
-
---- apps/edit/CMakeLists.txt.orig 2008-06-21 11:49:28.000000000 +0000
-+++ apps/edit/CMakeLists.txt
-@@ -128,5 +128,6 @@ ELSE(WIN32)
- ENDIF(WIN32)
-
- TARGET_LINK_LIBRARIES( edit ${WXART2D_LIBS} kbool )
-+SET_TARGET_PROPERTIES( edit PROPERTIES SKIP_BUILD_RPATH ON )
-
-
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-ah
--- a/cad/boolean/patches/patch-ah Fri Aug 14 17:59:51 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2007/02/23 16:43:17 wiz Exp $
-
---- apps/edit/include/chandbas.h.orig 2005-03-04 14:20:52.000000000 +0000
-+++ apps/edit/include/chandbas.h
-@@ -298,7 +298,7 @@ class CommandHandler
- //!add files to the history
- bool AddFileToHistory(const wxString& file,const wxString& type);
- //!save the history files
-- bool CommandHandler::SaveHistory();
-+ bool SaveHistory();
-
- //!the file history
- //!holds some of the files that were loaded
diff -r a9a58b403601 -r 9001dd3a7872 cad/boolean/patches/patch-ai
--- a/cad/boolean/patches/patch-ai Fri Aug 14 17:59:51 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/02/23 16:42:31 wiz Exp $
-
---- apps/edit/include/insdlg.h.orig 2005-03-04 14:21:00.000000000 +0000
-+++ apps/edit/include/insdlg.h
-@@ -84,7 +84,7 @@ public:
- const wxPoint& pos,
- const wxSize& size, long style , MyBoolEdit* edit
- );
-- void MyCheckBox::OnMouseEvent(wxMouseEvent& event);
-+ void OnMouseEvent(wxMouseEvent& event);
- DECLARE_EVENT_TABLE()
- MyBoolEdit* m_edit;
- };
Home |
Main Index |
Thread Index |
Old Index