1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Update to Release 3.7.5.0.

Fix conflict with texlive-base

PR:		184368
Submitted by:	vladimir.chukharev (Infos and Patch to resolve the conflict)
This commit is contained in:
Michael Reifenberger 2015-01-19 17:30:48 +00:00
parent 64325337c3
commit ecf51d54a7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=377442
4 changed files with 2444 additions and 825 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qcad
PORTVERSION= 3.5.1.0
PORTVERSION= 3.7.5.0
PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= http://github.com/${PORTNAME}/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/ \
@ -18,8 +18,6 @@ LICENSE= GPLv3
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
CONFLICTS= texlive-base-*
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_JOBS_UNSAFE=yes
@ -47,8 +45,8 @@ SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \
qcadsnap qcadspatialindex qcadstemmer spatialindexnavel
STALIBS= dxflib stemmer
SHRDIR= fonts libraries patterns plugins scripts ts
#QSCRIPTS should not be installed to avoid conflicts with texlive-base
QSCRIPTS= bbox dwg2bmp dwg2pdf dwg2svg
SUB_FILES= ${QSCRIPTS}
pre-configure:
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
@ -64,9 +62,6 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/
${LN} -sf ${PREFIX}/bin/qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad
.for prog in ${QSCRIPTS}
${INSTALL_SCRIPT} ${WRKDIR}/${prog} ${STAGEDIR}${PREFIX}/bin
.endfor
.for lib in ${SHRLIBS:C|^|lib|:C|$|.so|}
${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0
${LN} -sf ${PREFIX}/lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib}

View File

@ -1,2 +1,2 @@
SHA256 (qcad/v3.5.1.0.tar.gz) = 9182776a46325fd58d3b7c0aee7da9cd5d4dcb3fcc4b3dc8274a50f6fd278b66
SIZE (qcad/v3.5.1.0.tar.gz) = 21347804
SHA256 (qcad/v3.7.5.0.tar.gz) = 2d1abbf0a6a56c44c8f3a0af6fbd51d315f27bd16a527bba391da9645b305e00
SIZE (qcad/v3.7.5.0.tar.gz) = 21973859

View File

@ -1,11 +1,9 @@
--- src/core/core.pro.orig 2013-08-06 17:32:09.000000000 +0200
+++ src/core/core.pro 2013-08-08 11:01:42.000000000 +0200
@@ -232,7 +232,7 @@
OTHER_FILES += core.dox math/math.dox
--- src/core/core.pro.orig 2015-01-11 21:24:31.997403718 +0100
+++ src/core/core.pro 2015-01-11 21:24:46.507444784 +0100
@@ -272,5 +272,5 @@
DEFINES += QCADCORE_LIBRARY
-LIBS += -lzlib -lopennurbs
+LIBS += -lz -lopenNURBS
-LIBS += -lopennurbs -lzlib
+LIBS += -lopenNURBS -lz
win32 {
LIBS += -lRpcrt4 -lAdvapi32

File diff suppressed because it is too large Load Diff