cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to qcad 2.0.5.0

Browse Source 
problem on amd64 fixed by Martynas Venckus, thanks

also tested by ckuethe, ajacoutot, Antti Harri, and Andreas Bihlmaier
This commit is contained in:
steven 2007-01-09 16:30:37 +00:00
parent 9d41023dfc
commit 7d7bc69e67
18 changed files with 1021 additions and 1415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
cad/qcad/Makefile
View File

@ -1,51 +1,59 @@
# $OpenBSD: Makefile,v 1.14 2006/12/02 20:24:17 pvalchev Exp $
# $OpenBSD: Makefile,v 1.15 2007/01/09 16:30:37 steven Exp $
COMMENT= "Qt-based 2D CAD system"
COMMENT= "Qt-based 2D CAD system"
DISTNAME= qcad-1.5.4
PKGNAME= ${DISTNAME}p0
DISTFILES= ${DISTNAME}-src.tar.gz
CATEGORIES= cad x11
V= 2.0.5.0
DISTNAME= qcad-${V}-1-community.src
PKGNAME= qcad-${V}
CATEGORIES= cad graphics
HOMEPAGE= http://www.qcad.org/
HOMEPAGE= http://www.ribbonsoft.com/qcad.html
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 c m pthread stdc++
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m pthread stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qcad/}
MASTER_SITES= http://www.ribbonsoft.com/archives/qcad/
MODULES= x11/qt3
MODQT_MT= Yes
USE_GMAKE= Yes
USE_X11= Yes
NO_REGRESS= Yes
MAKE_FLAGS= \
CXX='${CXX}' \
CXXFLAGS='${CXXFLAGS} -pthread -Wall -DQT_NO_DEBUG -DDATADIR=\"${PREFIX}/share\"' \
INCPATH='-I${MODQT_INCDIR}' \
LINK='${CXX}' \
LFLAGS='' \
LIBS='-pthread -L${MODQT_LIBDIR} -L${LOCALBASE}/lib -lqt-mt -L${X11BASE}/lib -lX11' \
AR='ar cq'
PORTHOME= ${WRKDIR}
ALL_TARGET= qcad
NO_REGRESS= Yes
MAKE_ENV+= QTDIR=${MODQT_LIBDIR} \
MAKE=${MAKE_PROGRAM}
pre-configure:
@perl -pi -e 's,!!CXXFLAGS!!,${CXXFLAGS},' ${WRKSRC}/mkspecs/defs.pro
@perl -pi -e 's,!!DOCDIR!!,${PREFIX}/share/doc/qcad,' \
${WRKSRC}/qcadlib/src/engine/rs_system.h
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \
${WRKSRC}/qcadlib/src/engine/rs_system.cpp
@perl -pi -e 's,!!QTDIR!!,${MODQT_LIBDIR},' \
${WRKSRC}/qcad/src/qc_applicationwindow.cpp
do-build:
cd ${WRKBUILD}/scripts && \
${SETENV} ${MAKE_ENV} /bin/sh ./build_qcad.sh
do-install:
chmod ${DIRMODE} ${WRKSRC}/libraries/mechanical/screws/chc
${INSTALL_PROGRAM} ${WRKBUILD}/qcad ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qcad
${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/qcad
.for dir in cur fonts hatches messages xpm
${INSTALL_PROGRAM} ${WRKBUILD}/qcad/qcad ${PREFIX}/bin
.for dir in fonts patterns qm
${INSTALL_DATA_DIR} ${PREFIX}/share/qcad/${dir}
${INSTALL_DATA} ${WRKSRC}/${dir}/* ${PREFIX}/share/qcad/${dir}
${INSTALL_DATA} ${WRKSRC}/qcad/${dir}/* ${PREFIX}/share/qcad/${dir}
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/qcad/libraries
cd ${WRKSRC}/libraries; cp -R * ${PREFIX}/share/qcad/libraries
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qcad
${INSTALL_DATA} ${WRKSRC}/qcad/data/* ${PREFIX}/share/examples/qcad
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qcad
cd ${WRKSRC}/doc; cp -R * ${PREFIX}/share/doc/qcad
cd ${WRKSRC}/qcad/doc && tar cf - . | \
tar -C ${PREFIX}/share/doc/qcad -xf -
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/qcad/*
.include <bsd.port.mk>

8
cad/qcad/distinfo
View File

@ -1,4 +1,4 @@
MD5 (qcad-1.5.4-src.tar.gz) = 73964f6fd23780b2d83de508203617bd
RMD160 (qcad-1.5.4-src.tar.gz) = 3afa9e1e8ff7e3dc3c064310c1ad586cd0a9cfc1
SHA1 (qcad-1.5.4-src.tar.gz) = d28f31bb392cdcd5d7ea9396647e07851757c790
SIZE (qcad-1.5.4-src.tar.gz) = 2884049
MD5 (qcad-2.0.5.0-1-community.src.tar.gz) = 96b6a56027782aec953c9c4e64c5998c
RMD160 (qcad-2.0.5.0-1-community.src.tar.gz) = 85f0b6d3c1edaa0c19494436413521316e803429
SHA1 (qcad-2.0.5.0-1-community.src.tar.gz) = aff563389d1285740f6bf7e28f93b8df0f902e0c
SIZE (qcad-2.0.5.0-1-community.src.tar.gz) = 4470033

13
cad/qcad/patches/patch-mkspecs_defs_pro Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-mkspecs_defs_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
--- mkspecs/defs.pro.orig Tue Nov 22 12:47:28 2005
+++ mkspecs/defs.pro Tue Jan 9 16:38:47 2007
@@ -1,6 +1,7 @@
# $Id: patch-mkspecs_defs_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
-QMAKE_CXXFLAGS_DEBUG += -pedantic
-QMAKE_CXXFLAGS += -pedantic
+QMAKE_CXXFLAGS_DEBUG += !!CXXFLAGS!!
+QMAKE_CXXFLAGS += !!CXXFLAGS!!
+QMAKE_CXXFLAGS_RELEASE =
win32 {
QMAKE_CFLAGS_THREAD -= -mthreads

12
cad/qcad/patches/patch-qcad_src_qc_applicationwindow_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-qcad_src_qc_applicationwindow_cpp,v 1.1 2007/01/09 16:30:37 steven Exp $
--- qcad/src/qc_applicationwindow.cpp.orig Sat Jan 6 16:31:24 2007
+++ qcad/src/qc_applicationwindow.cpp Sat Jan 6 16:54:10 2007
@@ -2943,7 +2943,7 @@ void QC_ApplicationWindow::slotHelpManua
RS_SYSTEM->getAppDir().latin1());
RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
RS_SYSTEM->getAppDir().latin1());
- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
+ assistant = new QAssistantClient("!!QTDIR!!/bin", this);
connect(assistant, SIGNAL(error(const QString&)),
this, SLOT(slotError(const QString&)));
QStringList args;

12
cad/qcad/patches/patch-qcad_src_qcad_pro Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-qcad_src_qcad_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
--- qcad/src/qcad.pro.orig Sat Jan 6 22:12:34 2007
+++ qcad/src/qcad.pro Sat Jan 6 22:12:45 2007
@@ -3,7 +3,7 @@ TEMPLATE = app
CONFIG += qt warn_on link_prl
exists( custom.pro ) {
- include( custom.pro )
+# include( custom.pro )
}
# global defs

11
cad/qcad/patches/patch-qcadlib_src_engine_rs_arc_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-qcadlib_src_engine_rs_arc_cpp,v 1.1 2007/01/09 16:30:37 steven Exp $
--- qcadlib/src/engine/rs_arc.cpp.orig Tue Nov 22 12:52:35 2005
+++ qcadlib/src/engine/rs_arc.cpp Thu Jan 4 00:40:05 2007
@@ -647,6 +647,7 @@ void RS_Arc::draw(RS_Painter* painter, R
// Pattern:
RS_LineTypePattern* pat;
if (isSelected()) {
+ static RS_LineTypePattern patternSelected(2, 1.0, -3.0);
pat = &patternSelected;
} else {
pat = view->getPattern(getPen().getLineType());

11
cad/qcad/patches/patch-qcadlib_src_engine_rs_circle_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-qcadlib_src_engine_rs_circle_cpp,v 1.1 2007/01/09 16:30:37 steven Exp $
--- qcadlib/src/engine/rs_circle.cpp.orig Tue Nov 22 12:52:38 2005
+++ qcadlib/src/engine/rs_circle.cpp Thu Jan 4 00:39:42 2007
@@ -317,6 +317,7 @@ void RS_Circle::draw(RS_Painter* painter
// Pattern:
RS_LineTypePattern* pat;
if (isSelected()) {
+ static RS_LineTypePattern patternSelected(2, 1.0, -3.0);
pat = &patternSelected;
} else {
pat = view->getPattern(getPen().getLineType());

11
cad/qcad/patches/patch-qcadlib_src_engine_rs_ellipse_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-qcadlib_src_engine_rs_ellipse_cpp,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/engine/rs_ellipse.cpp.orig Tue Nov 22 12:52:30 2005
+++ qcadlib/src/engine/rs_ellipse.cpp Thu Jan 4 00:39:20 2007
@@ -481,6 +481,7 @@ void RS_Ellipse::draw(RS_Painter* painte
// Pattern:
RS_LineTypePattern* pat;
if (isSelected()) {
+ static RS_LineTypePattern patternSelected(2, 1.0, -3.0);
pat = &patternSelected;
} else {
pat = view->getPattern(getPen().getLineType());

11
cad/qcad/patches/patch-qcadlib_src_engine_rs_line_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-qcadlib_src_engine_rs_line_cpp,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/engine/rs_line.cpp.orig Tue Nov 22 12:52:35 2005
+++ qcadlib/src/engine/rs_line.cpp Thu Jan 4 00:38:03 2007
@@ -457,6 +457,7 @@ void RS_Line::draw(RS_Painter* painter,
// Pattern:
RS_LineTypePattern* pat;
if (isSelected()) {
+ static RS_LineTypePattern patternSelected(2, 1.0, -3.0);
pat = &patternSelected;
} else {
pat = view->getPattern(getPen().getLineType());

37
cad/qcad/patches/patch-qcadlib_src_engine_rs_system_cpp Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-qcadlib_src_engine_rs_system_cpp,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/engine/rs_system.cpp.orig Sat Jan 6 17:11:57 2007
+++ qcadlib/src/engine/rs_system.cpp Sat Jan 6 17:13:05 2007
@@ -270,15 +270,9 @@ RS_StringList RS_System::getFileList(con
/*RS_StringList dirList;
- // Redhat style:
- dirList.append("/usr/share/" + appDirName);
+ // OpenBSD style:
+ dirList.append("!!LOCALBASE!!/share/" + appDirName);
- // SuSE style:
- dirList.append("/usr/X11R6/" + appDirName);
-
- dirList.append("/usr/X11R6/share/" + appDirName);
- dirList.append(getHomeDir() + "/." + appDirName);
-
// Local directory:
dirList.append(".");
//dirList.append(getCurrentDir());
@@ -333,13 +327,8 @@ RS_StringList RS_System::getDirectoryLis
dirList.append(appDir + "/" + subDirectory);
}
- // Redhat style:
- dirList.append("/usr/share/" + appDirName + "/" + subDirectory);
-
- // SuSE style:
- dirList.append("/usr/X11R6/" + appDirName + "/" + subDirectory);
-
- dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
+ // OpenBSD style:
+ dirList.append("!!LOCALBASE!!/share/" + appDirName + "/" + subDirectory);
dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
#ifdef __APPLE__

13
cad/qcad/patches/patch-qcadlib_src_engine_rs_system_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-qcadlib_src_engine_rs_system_h,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/engine/rs_system.h.orig Tue Nov 22 12:52:38 2005
+++ qcadlib/src/engine/rs_system.h Sat Jan 6 19:49:01 2007
@@ -125,8 +125,7 @@ public:
* @return Absolute path to the documentation.
*/
RS_String getDocPath() {
- RS_StringList lst = getDirectoryList("doc");
- return lst.first();
+ return "!!DOCDIR!!";
}
/**

163
cad/qcad/patches/patch-qcadlib_src_gui_rs_graphicview_cpp Normal file
View File

@ -0,0 +1,163 @@
$OpenBSD: patch-qcadlib_src_gui_rs_graphicview_cpp,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/gui/rs_graphicview.cpp.orig Tue Nov 22 12:52:28 2005
+++ qcadlib/src/gui/rs_graphicview.cpp Thu Jan 4 01:01:38 2007
@@ -1740,75 +1740,117 @@ void RS_GraphicView::drawArcSmooth(const
*/
RS_LineTypePattern* RS_GraphicView::getPattern(RS2::LineType t) {
switch (t) {
- case RS2::SolidLine:
- return &patternSolidLine;
+ case RS2::SolidLine: {
+ static RS_LineTypePattern patternSolidLine(1, 10.0);
+ return &patternSolidLine;
+ }
break;
- case RS2::DotLine:
- return &patternDotLine;
+ case RS2::DotLine: {
+ static RS_LineTypePattern patternDotLine(2, 0.1, -6.2);
+ return &patternDotLine;
+ }
break;
- case RS2::DotLine2:
- return &patternDotLine2;
+ case RS2::DotLine2: {
+ static RS_LineTypePattern patternDotLine2(2, 0.1, -3.1);
+ return &patternDotLine2;
+ }
break;
- case RS2::DotLineX2:
- return &patternDotLineX2;
+ case RS2::DotLineX2: {
+ static RS_LineTypePattern patternDotLineX2(2, 0.1, -12.4);
+ return &patternDotLineX2;
+ }
break;
- case RS2::DashLine:
- return &patternDashLine;
+ case RS2::DashLine: {
+ static RS_LineTypePattern patternDashLine(2, 12.0, -6.0);
+ return &patternDashLine;
+ }
break;
- case RS2::DashLine2:
- return &patternDashLine2;
+ case RS2::DashLine2: {
+ static RS_LineTypePattern patternDashLine2(2, 6.0, -3.0);
+ return &patternDashLine2;
+ }
break;
- case RS2::DashLineX2:
- return &patternDashLineX2;
+ case RS2::DashLineX2: {
+ static RS_LineTypePattern patternDashLineX2(2, 24.0, -12.0);
+ return &patternDashLineX2;
+ }
break;
- case RS2::DashDotLine:
- return &patternDashDotLine;
+ case RS2::DashDotLine: {
+ static RS_LineTypePattern patternDashDotLine(4, 12.0, -5.95, 0.1, -5.95);
+ return &patternDashDotLine;
+ }
break;
- case RS2::DashDotLine2:
- return &patternDashDotLine2;
+ case RS2::DashDotLine2: {
+ static RS_LineTypePattern patternDashDotLine2(4, 6.0, -2.95, 0.1, -2.95);
+ return &patternDashDotLine2;
+ }
break;
- case RS2::DashDotLineX2:
- return &patternDashDotLineX2;
+ case RS2::DashDotLineX2: {
+ static RS_LineTypePattern patternDashDotLineX2(4, 24.0, -11.95, 0.1, -11.95);
+ return &patternDashDotLineX2;
+ }
break;
- case RS2::DivideLine:
- return &patternDivideLine;
+ case RS2::DivideLine: {
+ static RS_LineTypePattern patternDivideLine(6, 12.0, -5.9, 0.15, -5.9, 0.15, -5.9);
+ return &patternDivideLine;
+ }
break;
- case RS2::DivideLine2:
- return &patternDivideLine2;
+ case RS2::DivideLine2: {
+ static RS_LineTypePattern patternDivideLine2(6, 6.0, -2.9, 0.15, -2.9, 0.15, -2.9);
+ return &patternDivideLine2;
+ }
break;
- case RS2::DivideLineX2:
- return &patternDivideLineX2;
+ case RS2::DivideLineX2: {
+ static RS_LineTypePattern patternDivideLineX2(6, 24.0, -11.9, 0.15, -11.9, 0.15, -11.9);
+ return &patternDivideLineX2;
+ }
break;
- case RS2::CenterLine:
- return &patternCenterLine;
+ case RS2::CenterLine: {
+ static RS_LineTypePattern patternCenterLine(4, 32.0, -6.0, 6.0, -6.0);
+ return &patternCenterLine;
+ }
break;
- case RS2::CenterLine2:
- return &patternCenterLine2;
+ case RS2::CenterLine2: {
+ static RS_LineTypePattern patternCenterLine2(4, 16.0, -3.0, 3.0, -3.0);
+ return &patternCenterLine2;
+ }
break;
- case RS2::CenterLineX2:
- return &patternCenterLineX2;
+ case RS2::CenterLineX2: {
+ static RS_LineTypePattern patternCenterLineX2(4, 64.0, -12.0, 12.0, -12.0);
+ return &patternCenterLineX2;
+ }
break;
- case RS2::BorderLine:
- return &patternBorderLine;
+ case RS2::BorderLine: {
+ static RS_LineTypePattern patternBorderLine(6, 12.0, -6.0, 12.0, -5.95, 0.1, -5.95);
+ return &patternBorderLine;
+ }
break;
- case RS2::BorderLine2:
- return &patternBorderLine2;
+ case RS2::BorderLine2: {
+ static RS_LineTypePattern patternBorderLine2(6, 6.0, -3.0, 6.0, -2.95, 0.1, -2.95);
+ return &patternBorderLine2;
+ }
break;
- case RS2::BorderLineX2:
- return &patternBorderLineX2;
+ case RS2::BorderLineX2: {
+ static RS_LineTypePattern patternBorderLineX2(6, 24.0, -12.0, 24.0, -11.95, 0.1, -11.95);
+ return &patternBorderLineX2;
+ }
break;
- case RS2::LineByLayer:
- return &patternBlockLine;
+ case RS2::LineByLayer: {
+ static RS_LineTypePattern patternBlockLine(2, 0.5, -0.5);
+ return &patternBlockLine;
+ }
break;
- case RS2::LineByBlock:
- return &patternBlockLine;
+ case RS2::LineByBlock: {
+ static RS_LineTypePattern patternBlockLine(2, 0.5, -0.5);
+ return &patternBlockLine;
+ }
break;
default:
break;

44
cad/qcad/patches/patch-qcadlib_src_gui_rs_linetypepattern_h Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-qcadlib_src_gui_rs_linetypepattern_h,v 1.1 2007/01/09 16:30:38 steven Exp $
--- qcadlib/src/gui/rs_linetypepattern.h.orig Tue Nov 22 12:52:27 2005
+++ qcadlib/src/gui/rs_linetypepattern.h Wed Jan 3 23:10:17 2007
@@ -57,40 +57,4 @@ public:
int num;
};
-// Create line patterns
-static RS_LineTypePattern patternSolidLine(1, 10.0);
-
-static RS_LineTypePattern patternDotLine(2, 0.1, -6.2);
-static RS_LineTypePattern patternDotLine2(2, 0.1, -3.1);
-static RS_LineTypePattern patternDotLineX2(2, 0.1, -12.4);
-
-static RS_LineTypePattern patternDashLine(2, 12.0, -6.0);
-static RS_LineTypePattern patternDashLine2(2, 6.0, -3.0);
-static RS_LineTypePattern patternDashLineX2(2, 24.0, -12.0);
-
-static RS_LineTypePattern patternDashDotLine(4, 12.0, -5.95, 0.1, -5.95);
-static RS_LineTypePattern patternDashDotLine2(4, 6.0, -2.95, 0.1, -2.95);
-static RS_LineTypePattern patternDashDotLineX2(4, 24.0, -11.95, 0.1, -11.95);
-
-static RS_LineTypePattern patternDivideLine(
- 6, 12.0, -5.9, 0.15, -5.9, 0.15, -5.9);
-static RS_LineTypePattern patternDivideLine2(
- 6, 6.0, -2.9, 0.15, -2.9, 0.15, -2.9);
-static RS_LineTypePattern patternDivideLineX2(
- 6, 24.0, -11.9, 0.15, -11.9, 0.15, -11.9);
-
-static RS_LineTypePattern patternCenterLine(4, 32.0, -6.0, 6.0, -6.0);
-static RS_LineTypePattern patternCenterLine2(4, 16.0, -3.0, 3.0, -3.0);
-static RS_LineTypePattern patternCenterLineX2(4, 64.0, -12.0, 12.0, -12.0);
-
-static RS_LineTypePattern patternBorderLine(
- 6, 12.0, -6.0, 12.0, -5.95, 0.1, -5.95);
-static RS_LineTypePattern patternBorderLine2(
- 6, 6.0, -3.0, 6.0, -2.95, 0.1, -2.95);
-static RS_LineTypePattern patternBorderLineX2(
- 6, 24.0, -12.0, 24.0, -11.95, 0.1, -11.95);
-
-static RS_LineTypePattern patternBlockLine(2, 0.5, -0.5);
-static RS_LineTypePattern patternSelected(2, 1.0, -3.0);
-
#endif

12
cad/qcad/patches/patch-rfiledgn_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-rfiledgn_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
--- rfiledgn.cpp.orig Wed May 15 01:25:37 2002
+++ rfiledgn.cpp Wed May 15 01:44:55 2002
@@ -114,7 +114,7 @@ if(Open())
}
} else
at(offset + ((filehead.words+2)*2)-DGNELM_HDR_SIZE);
- }while(at() < (int)size());
+ }while(at() < (uint)size());
graphic->terminateAction();

17
cad/qcad/patches/patch-rprgdef_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-rprgdef_h,v 1.1 2002/12/09 17:35:57 margarida Exp $
--- rprgdef.h.orig Sun Dec 8 22:22:37 2002
+++ rprgdef.h Sun Dec 8 22:26:21 2002
@@ -28,10 +28,11 @@
#define RUNNING_WINDOWS false
#define RUNNING_SOLARIS false
#define RUNNING_IRIX false
+#ifndef DATADIR
#define DATADIR "/usr/share"
+#endif
-
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
#define DEF_FREEBSD
#undef DEF_LINUX
#define RUNNING_LINUX true // close enough

75
cad/qcad/patches/patch-scripts_build_qcad_sh Normal file
View File

@ -0,0 +1,75 @@
$OpenBSD: patch-scripts_build_qcad_sh,v 1.1 2007/01/09 16:30:38 steven Exp $
--- scripts/build_qcad.sh.orig Tue Nov 22 12:27:33 2005
+++ scripts/build_qcad.sh Sat Jan 6 22:13:03 2007
@@ -41,6 +41,11 @@ then
export MAKE=gmake
echo "Platform is FreeBSD"
platform=freebsd
+elif [ `uname` == "OpenBSD" ]
+then
+ export MAKE=${MAKE}
+ echo "Platform is OpenBSD"
+ platform=openbsd
else
export MAKE=make
echo "Platform is Linux"
@@ -53,7 +58,7 @@ fi
if [ -z $QTDIR ]
then
echo "QTDIR not set. Aborting.."
- exit
+ exit 1;
fi
modules="qcadlib qcadcmd qcadactions qcadguiqt"
@@ -164,7 +169,7 @@ cd ..
if [ ! -f fparser/lib/libfparser.a ]
then
echo "Building libfparser.a failed"
- exit;
+ exit 1;
fi
echo "-------- Building dxflib --------"
@@ -179,7 +184,7 @@ cd ..
if [ ! -f dxflib/lib/libdxf.a ]
then
echo "Building libdxf.a failed"
- exit;
+ exit 1;
fi
@@ -221,7 +226,7 @@ do
if [ ! -f $p/lib/*.a ]
then
echo "Building $p failed"
- exit;
+ exit 1;
fi
fi
done
@@ -249,6 +254,7 @@ then
echo "-------- Building Translations --------"
cd scripts
sh ./release_translations.sh
+ cd ..
fi
if [ "x$platform" == "xosx" ]
@@ -256,13 +262,13 @@ then
if [ ! -d qcad/$target.app ]
then
echo "Building qcad binary failed"
- exit;
+ exit 1;
fi
else
if [ ! -f qcad/$target ]
then
echo "Building qcad binary failed"
- exit;
+ exit 1;
fi
fi

28
cad/qcad/patches/patch-scripts_release_translations_sh Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-scripts_release_translations_sh,v 1.1 2007/01/09 16:30:38 steven Exp $
--- scripts/release_translations.sh.orig Sat Jan 6 21:40:01 2007
+++ scripts/release_translations.sh Sat Jan 6 21:40:08 2007
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+cd ..
+cwd=`pwd`
+
+for dir in qcad qcadactions qcadguiqt qcadcmd qcadlib
+do
+ cd $dir/src
+ echo "running lrelease in $dir/src..."
+ find . -type f -name '*.ts' -exec $QTDIR/bin/lrelease '{}' \;
+ find . -type f -name '*.pro' -exec $QTDIR/bin/lrelease '{}' \;
+ cd $cwd
+
+ cd $dir/src/ts
+ echo "copying from $dir/src/ts..."
+ for tf in *.qm
+ do
+ if [ ! -e $cwd/qcad/qm/$tf ]
+ then
+ cp $cwd/$dir/src/ts/$tf $cwd/qcad/qm/$tf
+ fi
+ done
+ cd $cwd
+done

1886
cad/qcad/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff