Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Mar 2021 20:08:25 +0000 (UTC)
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r569410 - head/cad/qcad
Message-ID:  <202103282008.12SK8Pk3066837@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Sun Mar 28 20:08:24 2021
New Revision: 569410
URL: https://svnweb.freebsd.org/changeset/ports/569410

Log:
  Stop setting MAKE_JOBS_UNSAFE by only building release or debug
  
  Submitted by:	rakuco@
  Differential Revision:	https://reviews.freebsd.org/D19219

Modified:
  head/cad/qcad/Makefile
  head/cad/qcad/pkg-plist

Modified: head/cad/qcad/Makefile
==============================================================================
--- head/cad/qcad/Makefile	Sun Mar 28 19:35:41 2021	(r569409)
+++ head/cad/qcad/Makefile	Sun Mar 28 20:08:24 2021	(r569410)
@@ -20,8 +20,6 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bash:shells/bash	\
 		${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
 
-MAKE_JOBS_UNSAFE=yes
-
 USES=		compiler:c++11-lang gl gmake qmake qt:5
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
@@ -55,6 +53,18 @@ OPTIONS_DEFINE=	EXAMPLES
 CFLAGS_i386= -fPIC
 CXXFLAGS_i386= -fPIC
 LDFLAGS_i386= -Wl,-z,notext
+
+.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:
 	${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}

Modified: head/cad/qcad/pkg-plist
==============================================================================
--- head/cad/qcad/pkg-plist	Sun Mar 28 19:35:41 2021	(r569409)
+++ head/cad/qcad/pkg-plist	Sun Mar 28 20:08:24 2021	(r569410)
@@ -578,8 +578,7 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/xmastree-02.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
@@ -588,10 +587,8 @@ lib/libstemmer.a
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103282008.12SK8Pk3066837>