Here is a preliminary oce diff, while it builds until 2027 in the
background.

> 
> Small things to fix:
> 
>  - since the distfile is an autogenerated GitHub tarball, use GH_*
>    instead of MASTER_SITES.
>  - CXXFLAGS+="-I/usr/X11R6/include" should be CONFIGURE_ARGS +=
>    -DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}".
>  - seems to be fine with COMPILER = base-clang ports-gcc.
>  - should be using the x11/tk module and MODTCL_WANTLIB/MODTK_WANTLIB.
>    and the cmake module automatically handles the ninja dependency.
>  - I think we usually drop :BOOL from CMake CONFIGURE_ARGS.
>  - WRKSRC defaults to WRKDIST, no need to set it.
>  - in general, order of variables should be closer to Makefile.template.

-- 

Tracey Emery

diff -ru cad/oce.orig/Makefile cad/oce/Makefile
--- cad/oce.orig/Makefile       Wed Oct  2 09:37:20 2019
+++ cad/oce/Makefile    Wed Oct  2 09:47:57 2019
@@ -1,16 +1,13 @@
 # $OpenBSD$
 
 V =                    0.18.3
-DISTNAME =             OCE-${V}
 COMMENT =              c++ 3d modeling library
-
-CATEGORIES =           cad
+DISTNAME =             OCE-${V}
 PKGNAME =              oce-${V}
 
-HOMEPAGE =             https://github.com/tpaviot/oce
+GH_ACCOUNT =           tpaviot
+GH_PROJECT =           oce
 
-MASTER_SITES =         https://github.com/tpaviot/oce/archive/
-
 SHARED_LIBS +=         FWOSPlugin                0.0 # 11.0
 SHARED_LIBS +=         PTKernel                  0.0 # 11.0
 SHARED_LIBS +=         TKBO                      0.0 # 11.0
@@ -75,34 +72,30 @@
 SHARED_LIBS +=         TKXDEDRAW                 0.0 # 11.0
 SHARED_LIBS +=         TKXSDRAW                  0.0 # 11.0
 
-WANTLIB += GL GLU ICE SM X11 Xext c freetype m pthread
-# WANTLIB += tcl86 tk86
+CATEGORIES =           cad
+HOMEPAGE =             https://github.com/tpaviot/oce
 
 #LGPLv2.1
 PERMIT_PACKAGE =       Yes
 
+WANTLIB += GL GLU ICE SM X11 Xext c freetype m pthread
+WANTLIB += ${MODTCL_WANTLIB} ${MODTK_WANTLIB}
+
 NO_TEST =              Yes
 
-COMPILER =             ports-clang
+COMPILER =             base-clang ports-clang
 
-BUILD_DEPENDS =                devel/ninja \
-                       lang/tcl/8.6 \
-                       x11/tk/8.6
+MODULES =              devel/cmake \
+                       x11/tk
 
-MODULES =              devel/cmake
+CONFIGURE_ARGS +=      -DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}" \
+                       -DOCE_BUILD_SHARED_LIB=ON \
+                       -DOCE_WITH_FREEIMAGE=ON \
+                       -DOCE_WITH_GL2PS=ON \
+                       -DOCE_DRAW=ON \
+                       -DOCE_MODEL=ON \
+                       -DOCE_OCAF=ON
 
-CXXFLAGS +=            "-I/usr/X11R6/include"
-
-CONFIGURE_ARGS +=      -DOCE_BUILD_SHARED_LIB:BOOL=ON \
-                       -DOCE_WITH_FREEIMAGE:BOOL=ON \
-                       -DOCE_WITH_GL2PS:BOOL=ON \
-                       -DOCE_DRAW:BOOL=ON \
-                       -DOCE_MODEL:BOOL=ON \
-                       -DOCE_DATA_EXCHANGE:BOOL=ON \
-                       -DOCE_OCAF:BOOL=ON \
-                       -DOCE_VISUALIZATION:BOOL=ON
-
 WRKDIST =              ${WRKDIR}/oce-OCE-${V}
-WRKSRC =               ${WRKDIST}
 
 .include <bsd.port.mk>

Reply via email to