librecad: Improve packaging

diff --git a/librecad/Makefile b/librecad/Makefile
index 326d4a11c82e83361fea36892edef09ae9d6b333..468163b8106f4cbedd24f8efd81c3806c4ae416f 100644 (file)
--- a/librecad/Makefile
+++ b/librecad/Makefile
@@ -53,6 +53,8 @@ QMAKE_OPTIONS+=       DISABLE_POSTSCRIPT=true
 
 do-configure:
        ${RUN} cd ${WRKSRC} && ${QTDIR}/bin/qmake ${QMAKE_OPTIONS:Q}
+       ${RUN} cd ${WRKSRC}/plugins && ${QTDIR}/bin/qmake \
+               INSTALLS+=target target.path=${PREFIX}/lib/librecad/plugins
 
 do-install:
        ${RUN} cd ${WRKSRC} && ./scripts/postprocess-unix.sh

diff --git a/librecad/PLIST b/librecad/PLIST
index eb5d635771e30eb9115fef313a1681a1aa3523fb..f78abe0c7530bb7b7c2f0d16ec104eec8cec7c64 100644 (file)
--- a/librecad/PLIST
+++ b/librecad/PLIST
@@ -47,6 +47,15 @@ lib/librecad/fonts/symbol_misc2.lff
 lib/librecad/fonts/symeteo.lff
 lib/librecad/fonts/symusic.lff
 lib/librecad/fonts/unicode.lff
+lib/librecad/plugins/libalign.so
+lib/librecad/plugins/libasciifile.so
+lib/librecad/plugins/libgear.so
+lib/librecad/plugins/libimportshp.so
+lib/librecad/plugins/liblist.so
+lib/librecad/plugins/libpicfile.so
+lib/librecad/plugins/libplotequation.so
+lib/librecad/plugins/libsameprop.so
+lib/librecad/plugins/libsample.so
 man/man1/librecad.1
 man/man1/ttf2lff.1
 share/applications/librecad.desktop

diff --git a/librecad/distinfo b/librecad/distinfo
index 6299dc59cfca7f7bcfea12e1ea0a2753038c256e..c54ebc61c0c2bea42f579eb5a7285561e91800b2 100644 (file)
--- a/librecad/distinfo
+++ b/librecad/distinfo
@@ -4,9 +4,9 @@ SHA1 (LibreCAD-2.2.0.rc1.tar.gz) = 2bffa19ac39a18d9d79fde72e624d7aebbdfa236
 RMD160 (LibreCAD-2.2.0.rc1.tar.gz) = 1521ddedf187c4ce9081062edf88f3f39d5bbb7c
 SHA512 (LibreCAD-2.2.0.rc1.tar.gz) = c7baf28511f75b63382f6f7c508b2e244638a0ecbe4cf99f4854b1f628a6772b942d95c7cbbf9082d06e066cd9ab2a33961ac48bb1d0846f5c2d75f657e5d914
 Size (LibreCAD-2.2.0.rc1.tar.gz) = 13578543 bytes
-SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = b7f97e24c90dd6aea1f90a7dd786ad63a7cbb216
-SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = c4ea36a88cbf749cd9e212ca37106ae00bdbb361
-SHA1 (patch-librecad_src_ui_forms_qg__commandwidget.cpp) = fd9e14becf06a56973d57911c52c1598bb7a80a4
-SHA1 (patch-librecad_src_ui_generic_colorwizard.cpp) = 849b3392ba01449f24e9056b57d5b1f692f6d6b6
-SHA1 (patch-librecad_src_ui_generic_widgetcreator.cpp) = 9102805b8b9fb5faef051f85b6665899ed6284be
-SHA1 (patch-scripts_postprocess-unix.sh) = 3bdca17863553c55be7565f0733f505900b7f7c3
+SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = 38ceb3cde81042a1eeb6c68ead874e1a3a3512bb
+SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = 1234b3b4e087c651da76c1d8d7770bebaa71dddc
+SHA1 (patch-librecad_src_ui_forms_qg__commandwidget.cpp) = 97c40234eec588569a862387dc509cc911cb31dc
+SHA1 (patch-librecad_src_ui_generic_colorwizard.cpp) = db049f7bc948913ef215a1a8c2d7d94367b12f1b
+SHA1 (patch-librecad_src_ui_generic_widgetcreator.cpp) = 1533f373059b7068638eea9ebc32a614c997c13d
+SHA1 (patch-scripts_postprocess-unix.sh) = dfa529bff1251967764c1a21654976844cc7e19a

diff --git a/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp b/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
index 66b2bc2ba2d2dcdd8ec701a94a2ccb038ca27a04..af3c0869110a72b326b8d9982e5230f0ffb2f419 100644 (file)
--- a/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
+++ b/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix pkgsrc PREFIX.
+
 --- librecad/src/lib/engine/rs_system.cpp.orig 2018-02-15 20:54:45.000000000 +0000
 +++ librecad/src/lib/engine/rs_system.cpp
 @@ -573,11 +573,8 @@ QStringList RS_System::getDirectoryList(

diff --git a/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp b/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
index eb2ab5ffc1ddc3e874d981359a9aeff1bc3ac6f9..61c985531c3068d563385ca855c8a1a9e7a3a5b4 100644 (file)
--- a/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
+++ b/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
@@ -1,5 +1,8 @@
 $NetBSD$
 
+ignore files in the plugins directory that do not contain '.so', as
+pkgsrc leaves some .la files there
+
 --- librecad/src/main/qc_applicationwindow.cpp.orig    2018-02-15 20:54:45.000000000 +0000
 +++ librecad/src/main/qc_applicationwindow.cpp
 @@ -399,6 +399,10 @@ void QC_ApplicationWindow::loadPlugins()

diff --git a/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp b/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
index d0fe3919121e58daa086c38b166577f2c166bee3..5bdcb2ae9bbb8823353c8bce167b742568758a1a 100644 (file)
--- a/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
+++ b/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add missing include.
+
 --- librecad/src/ui/forms/qg_commandwidget.cpp.orig    2018-02-15 20:54:45.000000000 +0000
 +++ librecad/src/ui/forms/qg_commandwidget.cpp
 @@ -27,6 +27,7 @@

diff --git a/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp b/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
index 9301a2d17156346bb0af17e0fa4ffabb4fe6dde3..188b942cd76d7741232cb5594c4cfc2a28966ff7 100644 (file)
--- a/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
+++ b/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add missing include.
+
 --- librecad/src/ui/generic/colorwizard.cpp.orig       2018-02-15 20:54:45.000000000 +0000
 +++ librecad/src/ui/generic/colorwizard.cpp
 @@ -27,6 +27,7 @@

diff --git a/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp b/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
index 7fcf7addb9130722b7475cd4649684c1228e3d06..9530ffdc79a05ec87f2cfdb4e3a2a3b29efcf31d 100644 (file)
--- a/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
+++ b/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add missing includes.
+
 --- librecad/src/ui/generic/widgetcreator.cpp.orig     2018-02-15 20:54:45.000000000 +0000
 +++ librecad/src/ui/generic/widgetcreator.cpp
 @@ -27,6 +27,8 @@

diff --git a/librecad/patches/patch-scripts_postprocess-unix.sh b/librecad/patches/patch-scripts_postprocess-unix.sh
index 9c81fc8048475c8d23041b685987b8d1e712b680..ccce7f0abfe29299563ce1dba8f87d737a8b5f96 100644 (file)
--- a/librecad/patches/patch-scripts_postprocess-unix.sh
+++ b/librecad/patches/patch-scripts_postprocess-unix.sh
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix QTDIR.
+
 --- scripts/postprocess-unix.sh.orig   2018-02-15 20:54:45.000000000 +0000
 +++ scripts/postprocess-unix.sh
 @@ -8,7 +8,7 @@ APPDATADIR="${THISDIR}/unix/appdata"