cingg-netbsd: workaround pkg-config script strange behaviour, clean up makefile, fix patch-ac

[Andrew Randrianasulu <randrianasulu%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Pushed By:	randrianasulu
Date:		Sat Jul 6 03:35:17 2024 +0300
Changeset:	3b7e989daadb5b36efe5f28400fec73314e37258

Modified Files:
	cingg-netbsd/Makefile
	cingg-netbsd/distinfo
	cingg-netbsd/patches/patch-ac

Log Message:
cingg-netbsd: workaround pkg-config script strange behaviour,
clean up makefile, fix patch-ac

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b7e989daadb5b36efe5f28400fec73314e37258

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cingg-netbsd/Makefile         | 12 ++++++------
 cingg-netbsd/distinfo         |  2 +-
 cingg-netbsd/patches/patch-ac |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 6d1e4654c3..959e450dc5 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -20,6 +20,11 @@ USE_LANGUAGES=		c c++
 
 USE_TOOLS+=	bash:run
 
+# fix pkgsrc bugs?
+.if exists(/usr/pkg/bin/pkg-config)
+TOOLS_PLATFORM.pkg-config?=	/usr/pkg/bin/pkg-config
+.endif
+
 
 #SHEBANG_GLOB=	*.sh *.bld
 #SHEBANG_FILES=	cinelerra-5.1/doc/ContextManual.pl
@@ -28,7 +33,6 @@ GNU_CONFIGURE=	yes
 
 CFLAGS+=		-fpermissive
 
-#MAKE_ENV=		C_INCLUDE_PATH=${PREFIX}/include:/usr/X11R7/include CPLUS_INCLUDE_PATH=${PREFIX}/include:${PREFIX}/include/uuid:${PREFIX}/include/ffmpeg6:/usr/X11R7/include:/usr/pkg/include/freetype2:/usr/pkg/include/OpenEXR:/usr/pkg/include/Imath:/usr/pkg/include/suil-0  LIBRARY_PATH=${PREFIX}/lib:/usr/X11R7/lib:${PREFIX}/lib/ffmpeg6 BSD=1
 MAKE_ENV=		BSD=1
 CONFIGURE_ARGS+=	--disable-static-build
 CONFIGURE_ARGS+=	--disable-lame
@@ -57,9 +61,7 @@ WRKSRC=			${WRKDIR}/cinelerra-${REV:C/(.......).*/\1/}
 CONFIGURE_DIRS=		${WRKSRC}/cinelerra-5.1
 
 post-patch:
-# fix pkgsrc bugs?
-	rm ${WRKSRC}/../.tools/bin/pkg-config
-	ln -s ${PREFIX}/bin/pkg-config ${WRKSRC}/../.tools/bin/pkg-config
+
 #	# fix lipng for lpng16
 	cd ${CONFIGURE_DIRS}/guicast && sed -i -e 's|-lz|-lz -lpng16|' Makefile
 	# remove thirdparty/src for more space
@@ -123,5 +125,3 @@ do-install:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../multimedia/libva/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-#.include "../../graphics/openexr/buildlink3.mk"
-#.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index 1b037d8ed9..b868262a34 100644
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -4,4 +4,4 @@ BLAKE2s (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 98552c0774608721d4adf1c5e6
 SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20b16d7137d76a306395844fe76b4410dcde92a2f3bf79f373a2dacdcc456bb7d72bd5939c8762b92c4724b3efe5817ee362002
 Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
 SHA1 (patch-aa) = c15fb44c81ac2d36af8fd4d4aa0ddcc38812675e
-SHA1 (patch-ac) = cab5d5df661cf7aacc08f2255d41cf81f6e3586f
+SHA1 (patch-ac) = baa34cf5a6315d6612b14e6ff78aa9cd81e1eb73
diff --git a/cingg-netbsd/patches/patch-ac b/cingg-netbsd/patches/patch-ac
index c99272fff3..88f1e924c5 100644
--- a/cingg-netbsd/patches/patch-ac
+++ b/cingg-netbsd/patches/patch-ac
@@ -22,7 +22,7 @@ lv2 and openexr fixes
   CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
   CHECK_LIB([suil], [suil-0], [suil_instance_new])
 - CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
-+ CFLAGS=" -I/usr/pkg/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
++ CFLAGS=" -I${PREFIX}/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
   CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
   CFG_CFLAGS+=" $(pkg-config --cflags lilv-0 2>/dev/null) $(pkg-config --cflags suil-0 2>/dev/null)"
   LIBS="$saved_LIBS"