pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cad/qcad qcad-2.0.5.0 Community Edition at last import...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/892217886860
branches:  trunk
changeset: 514613:892217886860
user:      chap <chap%pkgsrc.org@localhost>
date:      Thu Jun 15 08:26:58 2006 +0000

description:
qcad-2.0.5.0 Community Edition at last imported from wip. While the old
1.5.4 release was something of a toy, QCad was thoroughly reworked for 2.0
and could now be called usable for many practical purposes.

Versions 2.0.4.0 (initially) to 2.0.5.0 have been usable in wip for a bit
more than a year, and so seem ready to import.

  "Yes, that should be fine. Please watch the bulk builds for it and
   try to fix any problems that might appear." -wiz@

Updates to pkglint now produce some new suggestions, which I will make and
commit after confirming they don't break anything; at least this version I
already know to build successfully for me.

diffstat:

 cad/qcad/DESCR            |    14 +-
 cad/qcad/Makefile         |   110 ++-
 cad/qcad/Makefile.common  |     8 +
 cad/qcad/PLIST            |  1470 ++------------------------------------------
 cad/qcad/TODO             |    17 +
 cad/qcad/distinfo         |    16 +-
 cad/qcad/patches/patch-aa |    76 +-
 cad/qcad/patches/patch-ab |    26 +-
 cad/qcad/patches/patch-ac |    83 +--
 cad/qcad/patches/patch-ad |    13 -
 cad/qcad/patches/patch-af |    17 -
 11 files changed, 223 insertions(+), 1627 deletions(-)

diffs (truncated from 1941 to 300 lines):

diff -r b59418c73799 -r 892217886860 cad/qcad/DESCR
--- a/cad/qcad/DESCR    Thu Jun 15 03:44:07 2006 +0000
+++ b/cad/qcad/DESCR    Thu Jun 15 08:26:58 2006 +0000
@@ -1,4 +1,10 @@
-QCad is a simple 2D CAD System. With QCad you can easily construct and
-modify  drawings  with  ISO-texts,  dimensions, hatches and many other
-features and save them as DXF-files. These DXF-files are the interface
-to many CAD-systems such as AutoCAD and many others.
+QCad is an application for computer aided drafting in two dimensions. With QCad
+you can create technical drawings such as plans for buildings, interiors or
+mechanical parts. QCad drawing files are in DXF format (DXF 2004, R12),
+permitting interchange with a wide variety of CAD systems.  See also
+qcad-manual-(your language) and qcad-partlibrary to complete an installation.
+
+This package builds from the Community Edition sources, released under the
+GNU General Public License.  A commercially-licensed Professional Edition,
+which adds a scripting module and support, is available for several platforms;
+see the QCad home page.
diff -r b59418c73799 -r 892217886860 cad/qcad/Makefile
--- a/cad/qcad/Makefile Thu Jun 15 03:44:07 2006 +0000
+++ b/cad/qcad/Makefile Thu Jun 15 08:26:58 2006 +0000
@@ -1,57 +1,79 @@
-# $NetBSD: Makefile,v 1.38 2006/05/22 23:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/06/15 08:26:58 chap Exp $
+#
 
-DISTNAME=              qcad-1.5.4-src
-PKGNAME=               qcad-1.5.4
-PKGREVISION=           7
-CATEGORIES=            cad
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=qcad/}
+DISTNAME=              qcad-2.0.5.0-1-community.src
+# what to do about this numbering? RibbonSoft really seems to use four digits
+# (there's a 2.0.4.7 for some platforms), though I don't know about the
+# thing after the hyphen, which always seems to be 1. Can I use four digits?
+PKGNAME=               qcad-2.0.5.0
+
+.include "./Makefile.common"
+
+COMMENT=               2D CAD system
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.qcad.org/
-COMMENT=               2D CAD System
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake
+USE_LANGUAGES+=                c c++
+
+CONFIGURE_DIRS=        ${WRKSRC}/fparser ${WRKSRC}/dxflib
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
-MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH:Q}
-MAKE_ENV+=             QTDIR=${BUILDLINK_PREFIX.qt3}
-INSTALLATION_DIRS=     bin
-USE_LANGUAGES=         c++
+BUILD_DIRS=            ${CONFIGURE_DIRS}
+.for _sfx_ in lib cmd actions guiqt
+  BUILD_DIRS+=         ${WRKSRC}/qcad${_sfx_}
+.endfor
+BUILD_DIRS+=           ${WRKSRC}/qcad
 
-.include "../../mk/bsd.prefs.mk"
+MAKE_ENV+=             QMAKESPEC=${QTDIR}/mkspecs/default
+PREPEND_PATH+=         ${QTDIR}/bin
 
-.if ${OPSYS} == "Linux"
-QCAD_OPSYS = LINUX
-.elif ${OPSYS} == "SunOS"
-QCAD_OPSYS = SOLARIS
-.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
-QCAD_OPSYS = BSD
-.elif !empty(OPSYS:MIRIX)
-QCAD_OPSYS = IRIX
-.else
-QCAD_OPSYS = UNKNOWN
-PKG_FAIL_REASON+=      "Unknown operating system for ${PKGNAME}"
-.endif
+# I really want this to be post-*patch* where it makes sense, but QTDIR isn't
+# available until PHASES_AFTER_WRAPPER because it depends on
+# BUILDLINK_PREFIX.qt3-libs, which buildlink3 sets.  Nothing is easy.  :) The
+# patches have replaced old hardcoded paths with fixed cookies @PREFIX@ and
+# @QTDIR@.  The SUBST framework will replace the cookies with the proper
+# values.  Quoting invariants: the SUBST framework adds no quoting to the
+# SUBST_SED value (not documented but can be gleaned from mk/subst.mk); quoting
+# is provided here as follows: the escaped-newline real-newline escaped-newline
+# sequence separating individual sed commands is enclosed in ""s so it is not a
+# word separator for the shell; sed sees a single trailing blank on the first
+# command and a single leading blank on the second, neither of which matters.
+# The constant portions of the sed commands are (by inspection) free of shell
+# metacharacters; the variable portions ${PREFIX} and ${QTDIR} are subject to
+# two layers of quoting: S/=/\=/g ensures that any = in their values will be
+# \-escaped (because = has been chosen for the delimiter in the sed s command),
+# and then Q ensures that all of that is quoted as necessary to survive the
+# shell.
 
-do-configure:
-       for f in rappwin.cpp relement.cpp rfonts.cpp rprgdef.h; do      \
-               ${SED} -e 's:@PREFIX@:'${PREFIX}':g'                    \
-                       -e 's:@X11BASE@:${X11BASE}:g'                   \
-                       -e 's:@OPSYS@:${QCAD_OPSYS}:g'                  \
-                ${WRKSRC}/$$f  > ${WRKSRC}/$$f.tmp                     \
-               && ${MV} ${WRKSRC}/$$f.tmp ${WRKSRC}/$$f;               \
-       done
+SUBST_CLASSES+=        paths
+SUBST_STAGE.paths=     post-wrapper
+SUBST_MESSAGE.paths=   Attending to hard-coded paths.
+SUBST_FILES.paths+=    qcadlib/src/engine/rs_system.cpp
+SUBST_FILES.paths+=    qcad/src/qc_applicationwindow.cpp
+SUBST_SED.paths=       s=@PREFIX@=${PREFIX:S/=/\=/g:Q}=g"\
+                       ${.newline}\
+                       "s=@QTDIR@=${QTDIR:S/=/\=/g:Q}=g
+
+# Just setting BUILD_DIRS would be adequate if qcad could be built with
+# "prepare all" in each module, one by one.  But qcad needs all modules to
+# be prepare'd before any can be all'd, so prepare them here in a separate
+# loop duplicated from do-build.  The unmodified do-build then takes care
+# of the "all".  I didn't see an easier way.
+pre-build:
+       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}for DIR in ${BUILD_DIRS} ; do \
+               ( cd $${DIR} &&  \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+               -f ${MAKEFILE} prepare ) || exit 1 ; done
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/qcad
-       cd ${WRKSRC} && ${PAX} -rw AUTHORS COPYING README TODO cur doc  \
-               examples fonts hatches libraries messages po xpm        \
-               ${PREFIX}/share/qcad
+       cd ${WRKSRC}/qcad && umask 022 && \
+       ${PAX} -rwpm data fonts patterns qm ${PREFIX}/share/qcad
 
 .include "../../x11/qt3-libs/buildlink3.mk"
+BUILDLINK_DEPENDS.qt3-libs+=   qt3-libs>=3.3.4
 .include "../../x11/qt3-tools/buildlink3.mk"
-# XXX Please verify whether qt3-tools is really needed at run-time.
-# If it is, then remove this comment.  If it is not, then remove
-# this comment and the line below, and bump PKGREVISION.
-BUILDLINK_DEPMETHOD.qt3-tools= full
-.include "../../mk/pthread.buildlink3.mk"
+BUILDLINK_DEPENDS.qt3-tools+=  qt3-tools>=3.3.4
+BUILDLINK_DEPMETHOD.qt3-tools= full # uses assistant for help
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b59418c73799 -r 892217886860 cad/qcad/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/qcad/Makefile.common  Thu Jun 15 08:26:58 2006 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.common,v 1.1 2006/06/15 08:26:58 chap Exp $
+#
+
+CATEGORIES=            cad
+MASTER_SITES=          http://www.ribbonsoft.com/archives/qcad/
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              http://www.ribbonsoft.com/qcad.html
diff -r b59418c73799 -r 892217886860 cad/qcad/PLIST
--- a/cad/qcad/PLIST    Thu Jun 15 03:44:07 2006 +0000
+++ b/cad/qcad/PLIST    Thu Jun 15 08:26:58 2006 +0000
@@ -1,542 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/29 21:51:53 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/06/15 08:26:58 chap Exp $
 bin/qcad
-share/qcad/AUTHORS
-share/qcad/COPYING
-share/qcad/README
-share/qcad/TODO
-share/qcad/po/Makefile
-share/qcad/po/qcad.pot
-share/qcad/po/qcad_cs.po
-share/qcad/po/qcad_cs.ts
-share/qcad/po/qcad_de.po
-share/qcad/po/qcad_de.ts
-share/qcad/po/qcad_es.po
-share/qcad/po/qcad_es.ts
-share/qcad/po/qcad_et.po
-share/qcad/po/qcad_et.ts
-share/qcad/po/qcad_eu.po
-share/qcad/po/qcad_eu.ts
-share/qcad/po/qcad_fi.po
-share/qcad/po/qcad_fi.ts
-share/qcad/po/qcad_fr.po
-share/qcad/po/qcad_fr.ts
-share/qcad/po/qcad_ga.po
-share/qcad/po/qcad_ga.ts
-share/qcad/po/qcad_gr.po
-share/qcad/po/qcad_gr.ts
-share/qcad/po/qcad_hu.po
-share/qcad/po/qcad_hu.ts
-share/qcad/po/qcad_it.po
-share/qcad/po/qcad_it.ts
-share/qcad/po/qcad_jp.po
-share/qcad/po/qcad_jp.ts
-share/qcad/po/qcad_kr.po
-share/qcad/po/qcad_kr.ts
-share/qcad/po/qcad_nl.po
-share/qcad/po/qcad_nl.ts
-share/qcad/po/qcad_pl.po
-share/qcad/po/qcad_pl.ts
-share/qcad/po/qcad_pt.po
-share/qcad/po/qcad_pt.ts
-share/qcad/po/qcad_ru.po
-share/qcad/po/qcad_ru.ts
-share/qcad/po/qcad_sk.po
-share/qcad/po/qcad_sk.ts
-share/qcad/po/qcad_zh.po
-share/qcad/po/qcad_zh.ts
-share/qcad/cur/cur_cross_bmp.cur
-share/qcad/cur/cur_cross_mask.cur
-share/qcad/cur/cur_glass_bmp.cur
-share/qcad/cur/cur_glass_mask.cur
-share/qcad/doc/en/001.html
-share/qcad/doc/en/002.html
-share/qcad/doc/en/003.html
-share/qcad/doc/en/004.html
-share/qcad/doc/en/005.html
-share/qcad/doc/en/006.html
-share/qcad/doc/en/007.html
-share/qcad/doc/en/008.html
-share/qcad/doc/en/009.html
-share/qcad/doc/en/010.html
-share/qcad/doc/en/011.html
-share/qcad/doc/en/012.html
-share/qcad/doc/en/013.html
-share/qcad/doc/en/014.html
-share/qcad/doc/en/015.html
-share/qcad/doc/en/016.html
-share/qcad/doc/en/017.html
-share/qcad/doc/en/018.html
-share/qcad/doc/en/img/000000.png
-share/qcad/doc/en/img/boxangle.png
-share/qcad/doc/en/img/boxbevel.png
-share/qcad/doc/en/img/boxdirection.png
-share/qcad/doc/en/img/boxdistance.png
-share/qcad/doc/en/img/boxlength.png
-share/qcad/doc/en/img/boxround.png
-share/qcad/doc/en/img/createarcs.png
-share/qcad/doc/en/img/createarcsparallel.png
-share/qcad/doc/en/img/createarcspoints.png
-share/qcad/doc/en/img/createcircles.png
-share/qcad/doc/en/img/createcircles2.png
-share/qcad/doc/en/img/createcircles3.png
-share/qcad/doc/en/img/createdimsalign.png
-share/qcad/doc/en/img/createdimsangle.png
-share/qcad/doc/en/img/createdimsarrow.png
-share/qcad/doc/en/img/createdimsdiam.png
-share/qcad/doc/en/img/createdimshor.png
-share/qcad/doc/en/img/createdimsrad.png
-share/qcad/doc/en/img/createdimsver.png
-share/qcad/doc/en/img/createhatches.png
-share/qcad/doc/en/img/createlines.png
-share/qcad/doc/en/img/createlinesangle.png
-share/qcad/doc/en/img/createlinesbisectors.png
-share/qcad/doc/en/img/createlineshor.png
-share/qcad/doc/en/img/createlinesortho.png
-share/qcad/doc/en/img/createlinesortho2.png
-share/qcad/doc/en/img/createlinesparallels.png
-share/qcad/doc/en/img/createlinesrectangles.png
-share/qcad/doc/en/img/createlinestangents1.png
-share/qcad/doc/en/img/createlinestangents2.png
-share/qcad/doc/en/img/createlinesver.png
-share/qcad/doc/en/img/createpointssingle.png
-share/qcad/doc/en/img/dialogattrib.png
-share/qcad/doc/en/img/dialogcam.png
-share/qcad/doc/en/img/dialogdec.png
-share/qcad/doc/en/img/dialoghatch.png
-share/qcad/doc/en/img/dialogmirror.png
-share/qcad/doc/en/img/dialogmove.png
-share/qcad/doc/en/img/dialogmoverotate.png
-share/qcad/doc/en/img/dialogoptions_camexp.png
-share/qcad/doc/en/img/dialogoptions_qcad.png
-share/qcad/doc/en/img/dialogrotate.png
-share/qcad/doc/en/img/dialogrotaterotate.png
-share/qcad/doc/en/img/dialogscale.png
-share/qcad/doc/en/img/dimensionalign.png
-share/qcad/doc/en/img/dimensionangle.png
-share/qcad/doc/en/img/dimensiondiam.png
-share/qcad/doc/en/img/dimensionhor.png
-share/qcad/doc/en/img/dimensionpanel.png
-share/qcad/doc/en/img/dimensionrad.png
-share/qcad/doc/en/img/editattrib.png
-share/qcad/doc/en/img/editbevel.png
-share/qcad/doc/en/img/editclip.png
-share/qcad/doc/en/img/editcut.png
-share/qcad/doc/en/img/editcut2.png
-share/qcad/doc/en/img/editdelete.png
-share/qcad/doc/en/img/editlayer.png
-share/qcad/doc/en/img/editmirror.png
-share/qcad/doc/en/img/editmove.png
-share/qcad/doc/en/img/editmoverotate.png
-share/qcad/doc/en/img/editrotate.png
-share/qcad/doc/en/img/editrotaterotate.png
-share/qcad/doc/en/img/editround.png
-share/qcad/doc/en/img/editscale.png
-share/qcad/doc/en/img/editstretch.png
-share/qcad/doc/en/img/edittext.png
-share/qcad/doc/en/img/edittextelements.png
-share/qcad/doc/en/img/edittexttoobjects.png
-share/qcad/doc/en/img/edittrim.png



Home | Main Index | Thread Index | Old Index