Page MenuHomeFreeBSD
Files F161324277

D19219.id54146.diff
No OneTemporary
Actions

D19219.id54146.diff
View Options

Index: cad/qcad/Makefile
===================================================================
--- cad/qcad/Makefile
+++ cad/qcad/Makefile
@@ -4,7 +4,7 @@
PORTNAME= qcad
PORTVERSION= 3.21.3.15
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= cad
DIST_SUBDIR= ${PORTNAME}
@@ -17,8 +17,6 @@
${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
LIB_DEPENDS= libquazip5.so:archivers/quazip@qt5
-MAKE_JOBS_UNSAFE=yes
-
USES= compiler:c++11-lang gmake qmake qt:5
USE_GITHUB= yes
USE_LDCONFIG= yes
@@ -34,12 +32,6 @@
"" \
true
-.if defined(WITH_DEBUG)
-RESDIR= ${WRKSRC}/debug
-.else
-RESDIR= ${WRKSRC}/release
-.endif
-
SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \
qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip
STALIBS= dxflib stemmer
@@ -51,6 +43,18 @@
CFLAGS_i386= -fPIC
CXXFLAGS_i386= -fPIC
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+ALL_TARGET= debug
+PLIST_SUB+= DEBUG_LIB_SUFFIX="_debug"
+RESDIR= ${WRKSRC}/debug
+.else
+ALL_TARGET= release
+PLIST_SUB+= DEBUG_LIB_SUFFIX=""
+RESDIR= ${WRKSRC}/release
+.endif
pre-configure:
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
Index: cad/qcad/pkg-plist
===================================================================
--- cad/qcad/pkg-plist
+++ cad/qcad/pkg-plist
@@ -24,7 +24,6 @@
lib/libspatialindexnavel.so
lib/libspatialindexnavel.so.0
lib/libstemmer.a
-share/applications/usr_local_bin_qcadbin.desktop
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calibration.dxf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.dxf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.dxf
@@ -481,8 +480,7 @@
%%DATADIR%%/patterns/metric/triang.pat
%%DATADIR%%/patterns/metric/zigzag.pat
%%DATADIR%%/plugins/codecs/readme.txt
-%%DATADIR%%/plugins/designer/libqcadcustomwidgets.so
-%%DATADIR%%/plugins/designer/libqcadcustomwidgets_debug.so
+%%DATADIR%%/plugins/designer/libqcadcustomwidgets%%DEBUG_LIB_SUFFIX%%.so
%%DATADIR%%/plugins/designer/readme.txt
%%DATADIR%%/plugins/imageformats/libqgif.so
%%DATADIR%%/plugins/imageformats/libqico.so
@@ -491,10 +489,8 @@
%%DATADIR%%/plugins/imageformats/libqtga.so
%%DATADIR%%/plugins/imageformats/libqtiff.so
%%DATADIR%%/plugins/imageformats/readme.txt
-%%DATADIR%%/plugins/libqcaddxf.so
-%%DATADIR%%/plugins/libqcaddxf_debug.so
-%%DATADIR%%/plugins/libqcadscripts.so
-%%DATADIR%%/plugins/libqcadscripts_debug.so
+%%DATADIR%%/plugins/libqcaddxf%%DEBUG_LIB_SUFFIX%%.so
+%%DATADIR%%/plugins/libqcadscripts%%DEBUG_LIB_SUFFIX%%.so
%%DATADIR%%/plugins/printsupport/libcupsprintersupport.so
%%DATADIR%%/plugins/printsupport/readme.txt
%%DATADIR%%/plugins/script/libqtscript_core.so

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 3, 7:58 PM (5 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34635412
Default Alt Text
D19219.id54146.diff (2 KB)

Event Timeline