diff options
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/qcad/Makefile | 14 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 4 | ||||
| -rw-r--r-- | cad/qcad/files/patch-ab | 11 | ||||
| -rw-r--r-- | cad/qcad/files/patch-rs_math.h | 14 |
4 files changed, 5 insertions, 38 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index bf82e0b05b7b..70ed973470f2 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qcad -PORTVERSION= 2.0.3.3.1 +PORTVERSION= 2.0.4.0.1 PORTREVISION= 1 CATEGORIES= cad @@ -47,8 +47,6 @@ do-build: pre-install: @${ECHO_CMD} bin/qcad > ${PLIST} - @${FIND} ${WRKSRC}/qcad/doc/ -type f | \ - ${SED} -e "s:^${WRKSRC}/:%%PORTDOCS%%share/:g" >> ${PLIST} @${FIND} ${WRKSRC}/qcad/examples/ -type f | \ ${SED} -e "s:^${WRKSRC}/:%%PORTDOCS%%share/:g" >> ${PLIST} @${FIND} ${WRKSRC}/qcad/fonts/ -type f | \ @@ -57,27 +55,21 @@ pre-install: ${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST} @${FIND} ${WRKSRC}/qcad/qm/ -type f | \ ${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST} - @${FIND} ${WRKSRC}/qcad/scripts/ -type f | \ - ${SED} -e "s:^${WRKSRC}/:share/:g" >> ${PLIST} - @${FIND} -d ${WRKSRC}/qcad/doc -type d | \ - ${SED} -e "s:^${WRKSRC}/:%%PORTDOCS%%@dirrm share/:g" >> ${PLIST} @${ECHO_CMD} '%%PORTDOCS%%@dirrm share/qcad/examples' >> ${PLIST} @${ECHO_CMD} '@dirrm share/qcad/fonts' >> ${PLIST} @${ECHO_CMD} '@dirrm share/qcad/patterns' >> ${PLIST} @${ECHO_CMD} '@dirrm share/qcad/qm' >> ${PLIST} - @${ECHO_CMD} '@dirrm share/qcad/scripts/python' >> ${PLIST} - @${ECHO_CMD} '@dirrm share/qcad/scripts' >> ${PLIST} @${ECHO_CMD} '@dirrm share/qcad' >> ${PLIST} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${PREFIX}/bin/qcad @${MKDIR} ${DATADIR} -.for dir in fonts patterns qm scripts +.for dir in fonts patterns qm ${TAR} -C ${WRKSRC}/qcad --exclude CVS -cf - ${dir} | \ ${TAR} -C ${DATADIR} --unlink -xf - .endfor .if !defined(NOPORTDOCS) -.for dir in doc examples +.for dir in examples ${TAR} -C ${WRKSRC}/qcad --exclude CVS -cf - ${dir} | \ ${TAR} -C ${DATADIR} --unlink -xf - .endfor diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index f67986c6a8c0..8d823ab02f13 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,2 +1,2 @@ -MD5 (qcad-2.0.3.3-1.src.tar.gz) = 31a809a339813d8b2e4ead7a2ca8f81c -SIZE (qcad-2.0.3.3-1.src.tar.gz) = 4877504 +MD5 (qcad-2.0.4.0-1.src.tar.gz) = d99ae2855029af21f544e302a60d6840 +SIZE (qcad-2.0.4.0-1.src.tar.gz) = 3169984 diff --git a/cad/qcad/files/patch-ab b/cad/qcad/files/patch-ab deleted file mode 100644 index 1e2c5d362411..000000000000 --- a/cad/qcad/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- qcadlib/src/engine/rs_graphic.cpp.orig Thu Sep 9 07:31:40 2004 -+++ qcadlib/src/engine/rs_graphic.cpp Thu Sep 9 07:32:03 2004 -@@ -518,7 +518,7 @@ - if (fabs(s.x)>1.0e-6) { - fx = ps.x / s.x; - } -- if (fabs(s.y>1.0e-6)) { -+ if (fabs(s.y)>1.0e-6) { - fy = ps.y / s.y; - } - diff --git a/cad/qcad/files/patch-rs_math.h b/cad/qcad/files/patch-rs_math.h deleted file mode 100644 index 4cab00958ea2..000000000000 --- a/cad/qcad/files/patch-rs_math.h +++ /dev/null @@ -1,14 +0,0 @@ ---- qcadlib/src/math/rs_math.h.orig Sat Aug 21 20:00:56 2004 -+++ qcadlib/src/math/rs_math.h Sat Aug 21 20:07:09 2004 -@@ -45,8 +45,9 @@ - #include "rs_vector.h" - - #ifdef __GNUC__ --#define min(x,y) (x<y ? x : y) --#define max(x,y) (x>y ? x : y) -+//#define min(x,y) (x<y ? x : y) -+//#define max(x,y) (x>y ? x : y) -+using namespace std; - #endif - - #define ARAD 57.29577951308232 |