Tue Oct 4 10:21:19 2022 UTC ()
oce: fix reference to non-existent file

fix pkglint while here


(wiz)
diff -r1.10 -r1.11 pkgsrc/cad/oce/Makefile
diff -r1.3 -r1.4 pkgsrc/cad/oce/PLIST.x11
diff -r1.5 -r1.6 pkgsrc/cad/oce/buildlink3.mk
cvs diff -r1.10 -r1.11 pkgsrc/cad/oce/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/oce/Attic/Makefile 2022/03/19 23:55:42 1.10
+++ pkgsrc/cad/oce/Attic/Makefile 2022/10/04 10:21:19 1.11
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile,v 1.10 2022/03/19 23:55:42 brook Exp $ 1# $NetBSD: Makefile,v 1.11 2022/10/04 10:21:19 wiz Exp $
2 2
3DISTNAME= OCE-0.18.3 3DISTNAME= OCE-0.18.3
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= cad 6CATEGORIES= cad
7MASTER_SITES= ${MASTER_SITE_GITHUB:=tpaviot/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=tpaviot/}
 8GITHUB_TAG= ${DISTNAME}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/tpaviot/oce/ 11HOMEPAGE= https://github.com/tpaviot/oce/
11COMMENT= Open CASCADE Community Edition 12COMMENT= Open CASCADE Community Edition
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14GITHUB_TAG= ${DISTNAME} 
15WRKSRC= ${WRKDIR}/oce-${DISTNAME} 15WRKSRC= ${WRKDIR}/oce-${DISTNAME}
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20 20
21CHECK_PORTABILITY_SKIP+= samples/qt/* 21CHECK_PORTABILITY_SKIP+= samples/qt/*
22 22
23# mk/configure/cmake.mk disables rpath handling 23# mk/configure/cmake.mk disables rpath handling
24# but we need it for a lib subpath 24# but we need it for a lib subpath
25LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/oce 25LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/oce
26 26
27CMAKE_ARGS+= -DOCE_INSTALL_PREFIX:PATH=${PREFIX} 27CMAKE_ARGS+= -DOCE_INSTALL_PREFIX:PATH=${PREFIX}
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31SUBST_CLASSES+= prefix 31SUBST_CLASSES+= prefix
32SUBST_MESSAGE.prefix= Fixing PREFIX path. 32SUBST_MESSAGE.prefix= Fixing PREFIX path.
33SUBST_STAGE.prefix= post-configure 33SUBST_STAGE.prefix= post-configure
34SUBST_FILES.prefix= CMakeFiles/Export/lib/oce/OCE-libraries-release.cmake 34SUBST_FILES.prefix= CMakeFiles/Export/*/OCE-libraries-release.cmake
35.if !empty(OPSYS:MDarwin) 35.if ${OPSYS} == Darwin
36SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.dylib|\1|g" 36SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.dylib|\1|g"
37.else 37.else
38SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.so|\1|g" 38SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.so|\1|g"
39.endif 39.endif
40 40
41PLIST_VARS+= Darwin not_Darwin 41PLIST_VARS+= Darwin not_Darwin
42.if !empty(OPSYS:MDarwin) 42.if ${OPSYS} == Darwin
43PLIST.Darwin= yes 43PLIST.Darwin= yes
44.else 44.else
45PLIST.not_Darwin= yes 45PLIST.not_Darwin= yes
46.endif 46.endif
47 47
48.include "options.mk" 48.include "options.mk"
49 49
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/cad/oce/Attic/PLIST.x11 (expand / switch to unified diff)

--- pkgsrc/cad/oce/Attic/PLIST.x11 2022/03/19 23:55:42 1.3
+++ pkgsrc/cad/oce/Attic/PLIST.x11 2022/10/04 10:21:19 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.x11,v 1.3 2022/03/19 23:55:42 brook Exp $ 1@comment $NetBSD: PLIST.x11,v 1.4 2022/10/04 10:21:19 wiz Exp $
2include/oce/AIS_AngleDimension.hxx 2include/oce/AIS_AngleDimension.hxx
3include/oce/AIS_AttributeFilter.lxx 3include/oce/AIS_AttributeFilter.lxx
4include/oce/AIS_Axis.lxx 4include/oce/AIS_Axis.lxx
5include/oce/AIS_Chamf2dDimension.lxx 5include/oce/AIS_Chamf2dDimension.lxx
6include/oce/AIS_Chamf3dDimension.lxx 6include/oce/AIS_Chamf3dDimension.lxx
7include/oce/AIS_Circle.lxx 7include/oce/AIS_Circle.lxx
8include/oce/AIS_ColoredShape.hxx 8include/oce/AIS_ColoredShape.hxx
9include/oce/AIS_ConnectedInteractive.lxx 9include/oce/AIS_ConnectedInteractive.lxx
10include/oce/AIS_DiameterDimension.hxx 10include/oce/AIS_DiameterDimension.hxx
11include/oce/AIS_Dimension.hxx 11include/oce/AIS_Dimension.hxx
12include/oce/AIS_EqualDistanceRelation.lxx 12include/oce/AIS_EqualDistanceRelation.lxx
13include/oce/AIS_ExclusionFilter.lxx 13include/oce/AIS_ExclusionFilter.lxx
14include/oce/AIS_FixRelation.lxx 14include/oce/AIS_FixRelation.lxx
@@ -51,26 +51,28 @@ include/oce/Aspect_RenderingContext.hxx @@ -51,26 +51,28 @@ include/oce/Aspect_RenderingContext.hxx
51include/oce/Aspect_Units.hxx 51include/oce/Aspect_Units.hxx
52include/oce/Aspect_XWD.hxx 52include/oce/Aspect_XWD.hxx
53include/oce/BinDrivers_Marker.hxx 53include/oce/BinDrivers_Marker.hxx
54include/oce/BinMNaming_NamedShapeDriver.lxx 54include/oce/BinMNaming_NamedShapeDriver.lxx
55include/oce/BinMXCAFDoc_LocationDriver.lxx 55include/oce/BinMXCAFDoc_LocationDriver.lxx
56include/oce/BinTObjDrivers.hxx 56include/oce/BinTObjDrivers.hxx
57include/oce/BinTObjDrivers_DocumentRetrievalDriver.hxx 57include/oce/BinTObjDrivers_DocumentRetrievalDriver.hxx
58include/oce/BinTObjDrivers_DocumentStorageDriver.hxx 58include/oce/BinTObjDrivers_DocumentStorageDriver.hxx
59include/oce/BinTObjDrivers_IntSparseArrayDriver.hxx 59include/oce/BinTObjDrivers_IntSparseArrayDriver.hxx
60include/oce/BinTObjDrivers_ModelDriver.hxx 60include/oce/BinTObjDrivers_ModelDriver.hxx
61include/oce/BinTObjDrivers_ObjectDriver.hxx 61include/oce/BinTObjDrivers_ObjectDriver.hxx
62include/oce/BinTObjDrivers_ReferenceDriver.hxx 62include/oce/BinTObjDrivers_ReferenceDriver.hxx
63include/oce/BinTObjDrivers_XYZDriver.hxx 63include/oce/BinTObjDrivers_XYZDriver.hxx
 64${PLIST.Darwin}include/oce/Cocoa_LocalPool.hxx
 65${PLIST.Darwin}include/oce/Cocoa_Window.hxx
64include/oce/DsgPrs_DatumPrs.hxx 66include/oce/DsgPrs_DatumPrs.hxx
65include/oce/Font_BRepFont.hxx 67include/oce/Font_BRepFont.hxx
66include/oce/Font_FTFont.hxx 68include/oce/Font_FTFont.hxx
67include/oce/Font_FTLibrary.hxx 69include/oce/Font_FTLibrary.hxx
68include/oce/Font_NListOfSystemFont.hxx 70include/oce/Font_NListOfSystemFont.hxx
69include/oce/Font_NameOfFont.hxx 71include/oce/Font_NameOfFont.hxx
70include/oce/Graphic3d_ArrayOfPrimitives.lxx 72include/oce/Graphic3d_ArrayOfPrimitives.lxx
71include/oce/Graphic3d_BndBox4d.hxx 73include/oce/Graphic3d_BndBox4d.hxx
72include/oce/Graphic3d_BndBox4f.hxx 74include/oce/Graphic3d_BndBox4f.hxx
73include/oce/Graphic3d_BoundBuffer.hxx 75include/oce/Graphic3d_BoundBuffer.hxx
74include/oce/Graphic3d_Buffer.hxx 76include/oce/Graphic3d_Buffer.hxx
75include/oce/Graphic3d_BufferType.hxx 77include/oce/Graphic3d_BufferType.hxx
76include/oce/Graphic3d_CAspectFillArea.hxx 78include/oce/Graphic3d_CAspectFillArea.hxx
@@ -397,28 +399,26 @@ include/oce/VrmlData_UnknownNode.hxx @@ -397,28 +399,26 @@ include/oce/VrmlData_UnknownNode.hxx
397include/oce/VrmlData_WorldInfo.hxx 399include/oce/VrmlData_WorldInfo.hxx
398include/oce/XCAFPrs_AISObject.hxx 400include/oce/XCAFPrs_AISObject.hxx
399include/oce/XmlMNaming_NamedShapeDriver.lxx 401include/oce/XmlMNaming_NamedShapeDriver.lxx
400include/oce/XmlMXCAFDoc_LocationDriver.lxx 402include/oce/XmlMXCAFDoc_LocationDriver.lxx
401include/oce/XmlTObjDrivers.hxx 403include/oce/XmlTObjDrivers.hxx
402include/oce/XmlTObjDrivers_DocumentRetrievalDriver.hxx 404include/oce/XmlTObjDrivers_DocumentRetrievalDriver.hxx
403include/oce/XmlTObjDrivers_DocumentStorageDriver.hxx 405include/oce/XmlTObjDrivers_DocumentStorageDriver.hxx
404include/oce/XmlTObjDrivers_IntSparseArrayDriver.hxx 406include/oce/XmlTObjDrivers_IntSparseArrayDriver.hxx
405include/oce/XmlTObjDrivers_ModelDriver.hxx 407include/oce/XmlTObjDrivers_ModelDriver.hxx
406include/oce/XmlTObjDrivers_ObjectDriver.hxx 408include/oce/XmlTObjDrivers_ObjectDriver.hxx
407include/oce/XmlTObjDrivers_ReferenceDriver.hxx 409include/oce/XmlTObjDrivers_ReferenceDriver.hxx
408include/oce/XmlTObjDrivers_XYZDriver.hxx 410include/oce/XmlTObjDrivers_XYZDriver.hxx
409${PLIST.not_Darwin}include/oce/Xw_Window.hxx 411${PLIST.not_Darwin}include/oce/Xw_Window.hxx
410${PLIST.Darwin}include/oce/Cocoa_LocalPool.hxx 
411${PLIST.Darwin}include/oce/Cocoa_Window.hxx 
412lib/libTKBin.so 412lib/libTKBin.so
413lib/libTKBin.so.11 413lib/libTKBin.so.11
414lib/libTKBin.so.11.0.0 414lib/libTKBin.so.11.0.0
415lib/libTKBinTObj.so 415lib/libTKBinTObj.so
416lib/libTKBinTObj.so.11 416lib/libTKBinTObj.so.11
417lib/libTKBinTObj.so.11.0.0 417lib/libTKBinTObj.so.11.0.0
418lib/libTKBinXCAF.so 418lib/libTKBinXCAF.so
419lib/libTKBinXCAF.so.11 419lib/libTKBinXCAF.so.11
420lib/libTKBinXCAF.so.11.0.0 420lib/libTKBinXCAF.so.11.0.0
421lib/libTKCAF.so 421lib/libTKCAF.so
422lib/libTKCAF.so.11 422lib/libTKCAF.so.11
423lib/libTKCAF.so.11.0.0 423lib/libTKCAF.so.11.0.0
424lib/libTKMeshVS.so 424lib/libTKMeshVS.so
cvs diff -r1.5 -r1.6 pkgsrc/cad/oce/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/cad/oce/Attic/buildlink3.mk 2020/08/17 20:17:17 1.5
+++ pkgsrc/cad/oce/Attic/buildlink3.mk 2022/10/04 10:21:19 1.6
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.5 2020/08/17 20:17:17 leot Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2022/10/04 10:21:19 wiz Exp $
2 2
3BUILDLINK_TREE+= oce 3BUILDLINK_TREE+= oce
4 4
5.if !defined(OCE_BUILDLINK3_MK) 5.if !defined(OCE_BUILDLINK3_MK)
6OCE_BUILDLINK3_MK:= 6OCE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.oce+= oce>=0.18 8BUILDLINK_API_DEPENDS.oce+= oce>=0.18
9BUILDLINK_ABI_DEPENDS.oce?= oce>=0.18.3nb2 9BUILDLINK_ABI_DEPENDS.oce?= oce>=0.18.3nb2
10BUILDLINK_PKGSRCDIR.oce?= ../../cad/oce 10BUILDLINK_PKGSRCDIR.oce?= ../../cad/oce
11 11
12BUILDLINK_INCDIRS.oce+= include/oce 12BUILDLINK_INCDIRS.oce+= include/oce
13 13
14pkgbase := oce 14pkgbase := oce
15.include "../../mk/pkg-build-options.mk" 15.include "../../mk/pkg-build-options.mk"
16 16
17.if !empty(PKG_BUILD_OPTIONS.oce:Mx11) 17.if ${PKG_BUILD_OPTIONS.oce:Mx11}
18.include "../../graphics/MesaLib/buildlink3.mk" 18.include "../../graphics/MesaLib/buildlink3.mk"
19.include "../../graphics/glu/buildlink3.mk" 19.include "../../graphics/glu/buildlink3.mk"
20.include "../../graphics/freetype2/buildlink3.mk" 20.include "../../graphics/freetype2/buildlink3.mk"
21.include "../../lang/tcl/buildlink3.mk" 21.include "../../lang/tcl/buildlink3.mk"
22.include "../../x11/tk/buildlink3.mk" 22.include "../../x11/tk/buildlink3.mk"
23.endif 23.endif
24.endif # OCE_BUILDLINK3_MK 24.endif # OCE_BUILDLINK3_MK
25 25
26BUILDLINK_TREE+= -oce 26BUILDLINK_TREE+= -oce