Some changes

* Missing upstream library version (unarr).
* Wantlib was somewhat different in my case - No Qt5OpenGL,Qt5Script
  but Qt5Svg is required (must recheck).
* Changed the file distribution to be more like release.
* PLIST was missing some files.

Otherwise works fine for me on amd64.

Unarr-------------------------------------------------------------------------- 
-DISTNAME =     unarr-1.0.1
+V =            1.0.1
+DISTNAME =     unarr-${V}
 
-SHARED_LIBS =  unarr   0.0
+SHARED_LIBS =  unarr   0.0 # 1.0.0
 
-HOMEPAGE =     https://github.com/selmf/unarr
+HOMEPAGE =     https://github.com/selmf/unarr/
 
-WANTLIB = bz2 lzma z
+WANTLIB += bz2 lzma z
 
-MASTER_SITES =         https://github.com/selmf/unarr/releases/download/v1.0.1/
+MASTER_SITES =         ${HOMEPAGE:=releases/download/v${V}/}
 
Yacreader----------------------------------------------------------------------
-COMMENT =      comics reader
+COMMENT =      read and manage your digital comic collection
 
-DISTNAME =     yacreader-9.8.0.2105165-src
-PKGNAME =      yacreader-9.8.0
+V =            9.8.0
+DISTNAME =     yacreader-${V}.2105165-src
+PKGNAME =      yacreader-${V}
 
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Multimedia
-WANTLIB += Qt5OpenGL Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Script
-WANTLIB += Qt5Sql Qt5Widgets c m poppler-qt5 unarr
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5 unarr
 
-MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/9.8.0/
+MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
 
-                       x11/qt5/qtscript
+                       x11/qt5/qtsvg
 
-WRKDIST =              ${WRKDIR}/yacreader-9.8.0.2105165
+WRKDIST =              ${WRKDIR}/${DISTNAME:S/-src//}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKBUILD}/YACReader/YACReader \
-               ${PREFIX}/bin/YACReader
-       ${INSTALL_PROGRAM} ${WRKBUILD}/YACReaderLibrary/YACReaderLibrary \
-               ${PREFIX}/bin/YACReaderLibrary
-       ${INSTALL_PROGRAM} \
-               ${WRKBUILD}/YACReaderLibraryServer/YACReaderLibraryServer \
-               ${PREFIX}/bin/YACReaderLibraryServer
-       ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 \
-               ${PREFIX}/man/man1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+.for bin in YACReader YACReaderLibrary YACReaderLibraryServer
+       ${INSTALL_PROGRAM} ${WRKBUILD}/${bin}/${bin} ${PREFIX}/bin
+.endfor
+       ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 ${PREFIX}/man/man1
+.for dir in applications icons/hicolor/scalable/apps yacreader
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/${dir}
+.endfor
        ${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.desktop \
                ${PREFIX}/share/applications
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
        ${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.svg \
                ${PREFIX}/share/icons/hicolor/scalable/apps
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/languages
-       ${INSTALL_DATA} ${WRKSRC}/release/languages/*.qm \
-               ${PREFIX}/share/yacreader/languages/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server/{docroot,templates}
-       ${INSTALL_DATA} \
-               ${WRKSRC}/release/server/docroot/{css/*,images/*,*.html} \
-               ${PREFIX}/share/yacreader/server/docroot
-       ${INSTALL_DATA} ${WRKSRC}/release/server/templates/*.tpl \
-               ${PREFIX}/share/yacreader/server/templates
+       cd ${WRKSRC}/release && pax -rw . ${PREFIX}/share/yacreader

Attachment: yacreader.tar.gz
Description: Binary data

Attachment: unarr.tar.gz
Description: Binary data

Reply via email to