diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-12-11 04:13:24 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-12-11 04:13:24 +0000 |
| commit | ed3508b899553809bacc71c325c7bdcaabc42f4f (patch) | |
| tree | 1b7f6fef1f1d47ced464922183d833aad914b2e0 /cad/qcad | |
| parent | 83d9c8e0e72350a1f163773ff600ab0bf0e72b45 (diff) | |
| download | ports-ed3508b899553809bacc71c325c7bdcaabc42f4f.tar.gz ports-ed3508b899553809bacc71c325c7bdcaabc42f4f.zip | |
Notes
Diffstat (limited to 'cad/qcad')
| -rw-r--r-- | cad/qcad/Makefile | 5 | ||||
| -rw-r--r-- | cad/qcad/files/patch-aa | 2 | ||||
| -rw-r--r-- | cad/qcad/files/patch-ag | 35 | ||||
| -rw-r--r-- | cad/qcad/pkg-plist | 18 |
4 files changed, 57 insertions, 3 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index e214aaab6f29..2c3617263266 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -24,7 +24,8 @@ QTDIR?= ${X11BASE} USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes -MAKE_ENV= QTDIR="${QTDIR}" QMAKESPEC="${X11BASE}/share/qt/mkspecs/freebsd-g++" +MAKE_ENV= QTDIR="${QTDIR}" MAKE="${GMAKE}" \ + QMAKESPEC="${X11BASE}/share/qt/mkspecs/freebsd-g++" .include <bsd.port.pre.mk> @@ -41,7 +42,7 @@ CFLAGS+= -O0 # -spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ qcad.pro do-build: - cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} {SH} ./build_qcad.sh + cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${SH} ./build_qcad.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin/qcad diff --git a/cad/qcad/files/patch-aa b/cad/qcad/files/patch-aa index 7f88345482f0..7850ae298cf5 100644 --- a/cad/qcad/files/patch-aa +++ b/cad/qcad/files/patch-aa @@ -6,6 +6,6 @@ -export MAKE=make -#export MAKE=gmake +#export MAKE=make -+export MAKE=gmake ++#export MAKE=gmake #export QTDIR=/usr/share/qt3 #export PATH=$PATH:$QTDIR/bin diff --git a/cad/qcad/files/patch-ag b/cad/qcad/files/patch-ag new file mode 100644 index 000000000000..10139bd97c2a --- /dev/null +++ b/cad/qcad/files/patch-ag @@ -0,0 +1,35 @@ +--- dxflib/src/dl_entities.h.org Wed Dec 10 20:06:25 2003 ++++ dxflib/src/dl_entities.h Wed Dec 10 20:06:50 2003 +@@ -1128,10 +1128,6 @@ + */ + bool defined; + +-#ifndef __GCC2x__ +- union { +- struct { +-#endif + /*! Start point (X). */ + double x1; + /*! Start point (Y). */ +@@ -1140,10 +1136,6 @@ + double x2; + /*! End point (Y). */ + double y2; +-#ifndef __GCC2x__ +- }; +- struct { +-#endif + /*! Center point of arc (X). */ + double cx; + /*! Center point of arc (Y). */ +@@ -1156,10 +1148,6 @@ + double angle2; + /*! Counterclockwise flag. */ + bool ccw; +-#ifndef __GCC2x__ +- }; +- }; +-#endif + + }; + diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist index ad929b6ee23e..4dd47e9c25ca 100644 --- a/cad/qcad/pkg-plist +++ b/cad/qcad/pkg-plist @@ -27,7 +27,9 @@ share/qcad/fonts/cyrilc2.cxf share/qcad/fonts/scripts.cxf share/qcad/fonts/romancs.cxf share/qcad/fonts/greekc.cxf +share/qcad/fonts/normal_my.cxf share/qcad/fonts/unicode.cxf +share/qcad/fonts/unicode2.cxf share/qcad/fonts/greekp.cxf share/qcad/fonts/greeks.cxf share/qcad/fonts/normallatin1.readme @@ -45,6 +47,8 @@ share/qcad/fonts/courier.cxf share/qcad/fonts/romanp.cxf share/qcad/fonts/romans.cxf share/qcad/fonts/romant.cxf +share/qcad/fonts/times_my.cxf +share/qcad/fonts/test.cxf share/qcad/patterns/sacncr.dxf share/qcad/patterns/paisley.dxf share/qcad/patterns/sand.dxf @@ -91,30 +95,44 @@ share/qcad/patterns/ar-roof.dxf share/qcad/patterns/hexagon_a.dxf share/qcad/patterns/hexagon_b.dxf share/qcad/patterns/escher.dxf +share/qcad/qm/qcadactions_cs.qm share/qcad/qm/qcadactions_da.qm share/qcad/qm/qcadactions_de.qm +share/qcad/qm/qcadactions_el.qm share/qcad/qm/qcadactions_en.qm share/qcad/qm/qcadactions_fr.qm share/qcad/qm/qcadactions_hu.qm +share/qcad/qm/qcadactions_it.qm share/qcad/qm/qcadactions_no.qm +share/qcad/qm/qcadguiqt_cs.qm share/qcad/qm/qcadguiqt_da.qm share/qcad/qm/qcadguiqt_de.qm +share/qcad/qm/qcadguiqt_el.qm share/qcad/qm/qcadguiqt_en.qm share/qcad/qm/qcadguiqt_fr.qm share/qcad/qm/qcadguiqt_hu.qm +share/qcad/qm/qcadguiqt_it.qm share/qcad/qm/qcadguiqt_no.qm +share/qcad/qm/qcadcmd_cs.qm share/qcad/qm/qcadcmd_da.qm share/qcad/qm/qcadcmd_de.qm +share/qcad/qm/qcadcmd_el.qm share/qcad/qm/qcadcmd_en.qm share/qcad/qm/qcadcmd_fr.qm share/qcad/qm/qcadcmd_hu.qm share/qcad/qm/qcadcmd_no.qm +share/qcad/qm/qcadcmd_it.qm +share/qcad/qm/qcad_cs.qm share/qcad/qm/qcad_da.qm share/qcad/qm/qcad_de.qm +share/qcad/qm/qcad_el.qm share/qcad/qm/qcad_en.qm share/qcad/qm/qcad_fr.qm share/qcad/qm/qcad_hu.qm +share/qcad/qm/qcad_it.qm share/qcad/qm/qcad_no.qm +share/qcad/qm/qt_de.qm +share/qcad/qm/qt_fr.qm share/qcad/scripts/python/sine.py share/qcad/scripts/python/simple.py |