pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
librecad: Cleanup
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Oct 26 13:35:15 2019 +0200
Changeset: 7cccff024dd1dd69ba74ad936a12c49b874bc3a2
Modified Files:
librecad/Makefile
librecad/PLIST
Log Message:
librecad: Cleanup
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7cccff024dd1dd69ba74ad936a12c49b874bc3a2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
librecad/Makefile | 26 +++++---------------------
librecad/PLIST | 8 --------
2 files changed, 5 insertions(+), 29 deletions(-)
diffs:
diff --git a/librecad/Makefile b/librecad/Makefile
index e23ae63b24..326d4a11c8 100644
--- a/librecad/Makefile
+++ b/librecad/Makefile
@@ -33,32 +33,16 @@ SUBST_MESSAGE.prefix= Fix hardcoded path
SUBST_FILES.prefix+= librecad/src/lib/engine/rs_system.cpp
SUBST_VARS.prefix+= PREFIX
-#
-# We disable long double math functions, because otherwise one of
-# the boost headers brings in a log1pl() function which was not
-# present (in NetBSD 7) causing compilation failure
-#
-# We configure the plugins directory separately so that we can use
-# make install below, which handles the libtooling of the shared
-# plugins automatically
-##
-
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mclang*)
BUILDLINK_TRANSFORM+= rm:-fext-numeric-literals
.endif
-INSTALLATION_DIRS+= lib/${PKGBASE}/plugins
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
-INSTALLATION_DIRS+= share/data/pixmaps
-INSTALLATION_DIRS+= share/data/mime/packages
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
-INSTALLATION_DIRS+= include/${PKGBASE}
-INSTALLATION_DIRS+= share/data/${PKGBASE}/fonts
-INSTALLATION_DIRS+= share/data/${PKGBASE}/qm
-INSTALLATION_DIRS+= share/data/${PKGBASE}/library
-INSTALLATION_DIRS+= share/data/${PKGBASE}/patterns
+INSTALLATION_DIRS+= share/${PKGBASE}
+INSTALLATION_DIRS+= lib/${PKGBASE}
QMAKE_OPTIONS+= CONFIG+=release
QMAKE_OPTIONS+= BOOST_DIR=${PREFIX}
@@ -82,11 +66,11 @@ do-install:
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_MAN} ${WRKSRC}/tools/ttf2lff/ttf2lff.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- cd ${WRKSRC}/plugins && \
+ ${RUN} cd ${WRKSRC}/plugins && \
${SETENV} ${MAKE_ENV} ${MAKE} INSTALL_ROOT=${DESTDIR} install
- cd ${WRKSRC}/unix/resources && ${PAX} -rwpm fonts \
+ ${RUN} cd ${WRKSRC}/unix/resources && ${PAX} -rwpm fonts \
${DESTDIR}${PREFIX}/lib/librecad
- cd ${WRKSRC}/unix/resources && ${PAX} -rwpm library patterns qm \
+ ${RUN} cd ${WRKSRC}/unix/resources && ${PAX} -rwpm library patterns qm \
${DESTDIR}${PREFIX}/share/librecad
.include "../../x11/qt5-qtsvg/buildlink3.mk"
diff --git a/librecad/PLIST b/librecad/PLIST
index 5d14ab1948..eb5d635771 100644
--- a/librecad/PLIST
+++ b/librecad/PLIST
@@ -1500,11 +1500,3 @@ share/librecad/qm/plugins_tr.qm
share/librecad/qm/plugins_uk.qm
share/librecad/qm/plugins_zh_cn.qm
share/librecad/qm/plugins_zh_tw.qm
-@pkgdir share/data/pixmaps
-@pkgdir share/data/mime/packages
-@pkgdir share/data/librecad/qm
-@pkgdir share/data/librecad/patterns
-@pkgdir share/data/librecad/library
-@pkgdir share/data/librecad/fonts
-@pkgdir lib/librecad/plugins
-@pkgdir include/librecad
Home |
Main Index |
Thread Index |
Old Index