On Sun Feb 02, 2020 at 11:10:31PM +0100, Adam Wolk wrote:
> Hi ports@,
>
> Attaching an update to fotowall 1.0
>
> Notable port changes:
> - qt4 -> qt5.
> - Using github tarball instead of google code.
> - Adjusted WANTLIB/LIB_DEPENDS.
> - Added EXTRACT_CASES and pre-extract because
> the upstream tarball spills over WRKDIST
> instead of extracting to a sub directory.
> - Had to patch enricomath.h to not use the
> provided sincos(3) since we now have our own.
> This happened because I upstreamed our previous
> patch that enabled this path for us when we still
> didn't have it. I will upstream the revert also.
> - Patching out qstrcpy for strlcpy. This is because
> our x11/qt5 has patched out qstrcpy and the lib
> is not longer exposing it for external consumers.
> I saw two ways in how ports are handling it.
>
> 1. x11/qt5 itself replaced all uses with strlcpy
> 2. multimedia/phonon-backend patch qstrcpy -> strlcpy
>
> I opted for #1 but obviously having a close look on
> the patch is advised here.
>
> Upstream changelog:
>
> https://github.com/enricoros/fotowall/releases/tag/v1.0
>
> Tested on -current amd64.
>
> Feedback? OK's?
>
> Regards,
> Adam Wolk
Works here also with OpenGL. Here are some tweaks, maybe you'd like to
take over some:
- reorder MODULES, _DEPENDS
- fix tabs/ spaces
- use EXTRACT_SUFX = -RETRO.tar.bz2
OK rsadowski@
--- Makefile.orig Mon Feb 3 06:22:16 2020
+++ Makefile Mon Feb 3 06:24:57 2020
@@ -2,9 +2,9 @@
COMMENT = Pictures collage & creativity tool
-V = 1.0
-DISTNAME = Fotowall-${V}-RETRO
-PKGNAME = fotowall-${V}
+V = 1.0
+DISTNAME = Fotowall-${V}
+PKGNAME = ${DISTNAME:L}
CATEGORIES = graphics
@@ -18,19 +18,18 @@ WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5P
WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread
WANTLIB += ${COMPILER_LIBCXX}
-LIB_DEPENDS = x11/qt5/qtsvg
+MODULES = devel/qmake x11/qt5
-COMPILER = base-clang ports-gcc base-gcc
+LIB_DEPENDS = x11/qt5/qtsvg
+RUN_DEPENDS = devel/desktop-file-utils
+
MASTER_SITES = https://github.com/enricoros/fotowall/releases/download/v${V}/
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = -RETRO.tar.bz2
# avoid WRKDIST = ${WRKDIR}
EXTRACT_CASES= *.tar.bz2) \
bzip2 -dc ${FULLDISTDIR}/$$archive| ${TAR} xf - -C ${WRKDIST};;
-
-MODULES = devel/qmake x11/qt5
-RUN_DEPENDS = devel/desktop-file-utils
pre-extract:
@mkdir ${WRKDIST}
