On Sat Jul 13, 2024 at 05:01:11PM GMT, Omar Polo wrote:
> Rafael Sadowski <rafael@sizeofvoid.org> wrote:
> > New dependency qtadvanceddocking-4.3.1a to update math/labplot to 2.11.
> > Tested with the upcoming labplot update.
> > 
> > OK to import?
> 
> generally ok op@, please consider to cherry-pick nits from diff below
> (makefile spacing issues and one directory removed by make update-plist.)
> 
> --- Makefile.orig	Sat Jul 13 15:56:27 2024
> +++ Makefile	Sat Jul 13 15:57:33 2024
> @@ -1,12 +1,11 @@
> -
>  COMMENT =	advanced docking system for Qt
>  
> -V = 4.3.1
> +V =		4.3.1
>  DISTNAME =	qtadvanceddocking-${V}

Thanks

>  
> -DIST_TUPLE = github githubuser0xFFFF Qt-Advanced-Docking-System ${V} .
> +DIST_TUPLE =	github githubuser0xFFFF Qt-Advanced-Docking-System ${V} .

Thanks
>  
> -SHARED_LIBS +=  qt6advanceddocking        0.0 # 0.0
> +SHARED_LIBS +=	qt6advanceddocking        0.0 # 0.0

I always take the SHARED_LIBS by make plist and don't modify it.
I don't like to tab here and we should go with the generated output.

>  
>  CATEGORIES =	x11 devel
>  
> @@ -22,10 +21,9 @@
>  MODULES =		devel/cmake \
>  			x11/qt6
>  
> -WRKSRC =		 ${WRKDIR}/Qt-Advanced-Docking-System-4.3.1
> +WRKSRC =		${WRKDIR}/Qt-Advanced-Docking-System-4.3.1

Thanks
>  
>  CONFIGURE_ARGS +=	-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
> -
>  CONFIGURE_ARGS +=	-DADS_VERSION="${V}"

I prefer my way.

>  
>  MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
> --- pkg/PLIST.orig	Fri Jul 12 10:27:32 2024
> +++ pkg/PLIST	Sat Jul 13 16:59:31 2024
> @@ -23,7 +23,6 @@
>  include/qt6advanceddocking/PushButton.h
>  include/qt6advanceddocking/ResizeHandle.h
>  include/qt6advanceddocking/ads_globals.h
> -lib/cmake/
>  lib/cmake/qt6advanceddocking/
>  lib/cmake/qt6advanceddocking/adsTargets${MODCMAKE_BUILD_SUFFIX}
>  lib/cmake/qt6advanceddocking/adsTargets.cmake

haha as usual. I have to modify my workflow.