git: f92c6f19e7fc - main - cad/openscad*: Clean up

From: Michael Reifenberger <mr_at_FreeBSD.org>
Date: Wed, 16 Oct 2024 09:36:57 UTC
The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f92c6f19e7fc8262784cd87f30c064571e2a60a3

commit f92c6f19e7fc8262784cd87f30c064571e2a60a3
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2024-10-16 09:29:21 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2024-10-16 09:29:21 +0000

    cad/openscad*: Clean up
    
    Remove redundant audio/alsa-plugins dependency
    pet portlint
    
    Reported by:    makc@
---
 cad/openscad-devel/Makefile | 11 ++++++-----
 cad/openscad/Makefile       | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index b1876916c84b..912291def189 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -7,20 +7,19 @@ PKGNAMESUFFIX=	-devel
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 WWW=		https://www.openscad.org/
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/include/clipper2/clipper.h:cad/Clipper2 \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
-LIB_DEPENDS=	libasound_module_pcm_oss.so:audio/alsa-plugins \
-		libzip.so:archivers/libzip \
+LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
@@ -52,6 +51,8 @@ GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
+#CMAKE_OFF=	USE_GLAD:BOOL=OFF
+#CMAKE_ON=	USE_GLEW:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 5d33e58d388b..2fae0a0de03e 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -6,20 +6,19 @@ CATEGORIES=	cad
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 WWW=		https://www.openscad.org/
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/include/clipper2/clipper.h:cad/Clipper2 \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
-LIB_DEPENDS=	libasound_module_pcm_oss.so:audio/alsa-plugins \
-		libzip.so:archivers/libzip \
+LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
@@ -51,6 +50,8 @@ GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
+#CMAKE_ON=	USE_GLAD
+#CMAKE_OFF=	USE_GLEW
 
 .include <bsd.port.pre.mk>