fixup some generic script weirdness and custom filenames. ok sthen@

cad/oce/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2022/02/22 15:20:11 tracey Exp $
+# $OpenBSD: Makefile,v 1.5 2022/02/26 21:40:01 tracey Exp $
 
 BROKEN-powerpc = kicad is broken, this is the only consumer (save bulk time)
 
@@ -9,6 +9,7 @@ GH_ACCOUNT =	tpaviot
 GH_PROJECT =	oce
 GH_COMMIT =	98a788062f0f30593880b0df1bcf967408212ba4
 DISTNAME =	oce-7.6.0
+REVISION =	0
 
 .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
 	TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
@@ -43,4 +44,47 @@ RUN_DEPENDS =		${MODTK_RUN_DEPENDS} \
 CONFIGURE_ARGS +=	-DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}" \
 			-DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
 
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mlp64}
+BITS=64
+.else
+BITS=32
+.endif
+SUBST_VARS += BITS
+
+# fix bash and make installed script names less generic
+pre-configure:
+	sed -i "s,custom,oce_custom,g" \
+		${WRKSRC}/adm/templates/*.sh*
+	sed -i "s,env,oce_env,g" \
+		${WRKSRC}/adm/templates/*.sh*
+	sed -i "s,env,oce_env,g" \
+		${WRKSRC}/gen*
+	sed -i "s,custom,oce_custom,g" \
+		${WRKSRC}/gen*
+	sed -i "s,env\.,oce_env\.,g" \
+		${WRKSRC}/CMakeLists.txt
+	sed -i "s,custom\.,oce_custom\.,g" \
+		${WRKSRC}/CMakeLists.txt
+	sed -i "s,custom_,oce_custom_,g" \
+		${WRKSRC}/CMakeLists.txt
+	sed -i "s,draw\.,oce_draw\.,g" \
+		${WRKSRC}/CMakeLists.txt
+	sed -i "s,/bin/bash,/usr/bin/env bash," \
+		${WRKSRC}/adm/templates/*.sh*
+	mv ${WRKSRC}/adm/templates/custom.sh.main \
+		${WRKSRC}/adm/templates/oce_custom.sh.main
+	mv ${WRKSRC}/adm/templates/custom.build.sh.in \
+		${WRKSRC}/adm/templates/oce_custom.build.sh.in
+	mv ${WRKSRC}/adm/templates/custom.install.sh.in \
+		${WRKSRC}/adm/templates/oce_custom.install.sh.in
+	mv ${WRKSRC}/adm/templates/draw.sh \
+		${WRKSRC}/adm/templates/oce_draw.sh
+	mv ${WRKSRC}/adm/templates/env.build.sh.in \
+		${WRKSRC}/adm/templates/oce_env.build.sh.in
+	mv ${WRKSRC}/adm/templates/env.install.sh.in \
+		${WRKSRC}/adm/templates/oce_env.install.sh.in
+	mv ${WRKSRC}/adm/templates/env.samples.sh.in \
+		${WRKSRC}/adm/templates/oce_env.samples.sh.in
+
 .include <bsd.port.mk>

cad/oce/patches/patch-adm_templates_env_install_sh_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-adm_templates_env_install_sh_in,v 1.1 2022/02/26 21:40:01 tracey Exp $
+
+Index: adm/templates/env.install.sh.in
+--- adm/templates/env.install.sh.in.orig
++++ adm/templates/env.install.sh.in
+@@ -4,7 +4,7 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}
+ 
+ # ----- For compatibility with external application using CASROOT -----
+ if [ "${CASROOT}" == "" ]; then
+-  export CASROOT="@INSTALL_DIR@"
++  export CASROOT="@INSTALL_DIR@/share/opencascade"
+ fi
+ 
+ # ----- Define path to 3rdparty products -----

cad/oce/pkg/MESSAGE

@@ -0,0 +1,3 @@
+The following should be used to properly initialize and start OpenCascade:
+
+${LOCALBASE}/bin/bash ${LOCALBASE}/bin/oce_draw.sh

cad/oce/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2022/02/22 15:20:11 tracey Exp $
+@comment $OpenBSD: PLIST,v 1.3 2022/02/26 21:40:01 tracey Exp $
 bin/DRAWEXE
 @bin bin/DRAWEXE-7.6.0
-bin/custom.sh
-bin/custom_clang_64.sh
-bin/draw.sh
-bin/env.sh
+bin/oce_custom.sh
+bin/oce_custom_clang_${BITS}.sh
+bin/oce_draw.sh
+bin/oce_env.sh
 include/opencascade/
 include/opencascade/AIS.hxx
 include/opencascade/AIS_AngleDimension.hxx