--- src/pngsize.c.ORIG	2021-11-23 05:19:39 +0000
+++ src/pngsize.c	2021-11-23 05:36:15 +0000
@@ -27,16 +27,13 @@
 /* this is to make compile on aix work since they seem to define jmpbuf
    to be _jmpbuf which breaks compilation */
 
-#ifndef png_jmpbuf
-#ifdef PNG_SETJMP_SUPPORTED
-#  define png_jmpbuf(png_ptr)   ((png_ptr)->PNG_jmpbuf)
-#else
 #ifdef jmpbuf
 #undef jmpbuf
 #endif
+
+#ifndef png_jmpbuf
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
 #endif
-#endif
 
     if (setjmp(png_jmpbuf(png_read_ptr))) {
         png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp) NULL);
--- bindings/perl-shared/Makefile.PL.ORIG	2021-11-23 05:54:42 +0000
+++ bindings/perl-shared/Makefile.PL	2021-11-23 06:18:29 +0000
@@ -64,6 +64,7 @@
 		'INC'          => "-I${TOP_BUILDDIR}/src -I${TOP_SRCDIR}/src",
 		# Perl will figure out which one is valid
 		#'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
+               'dynamic_lib'  => {'OTHERLDFLAGS' => "-L/opt/freeware/lib -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib -Wl,-bmaxdata:0x80000000"},
 		'depend'       => {'RRDs.c' => "${TOP_BUILDDIR}/src/librrd.la"},
 		'LDFROM'       => '$(OBJECT) '.$librrd, 
 		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
--- bindings/tcl/Makefile.in.ORIG	2021-11-23 06:21:42 +0000
+++ bindings/tcl/Makefile.in	2022-01-04 05:33:18 +0000
@@ -685,7 +685,7 @@
 all-local: $(TCL_RRD_LIB)
 
 $(TCL_RRD_LIB): tclrrd.o
-	$(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
+	$(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS) -lc
 
 tclrrd.o: tclrrd.c
 	$(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -c $(srcdir)/tclrrd.c -DVERSION=\"$(VERSION)\"
--- src/Makefile.in.ORIG	2021-11-23 06:26:34 +0000
+++ src/Makefile.in	2021-11-23 06:27:19 +0000
@@ -550,7 +550,7 @@
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD = librrd.la librrdupd.la
 rrdupdate_SOURCES = rrdupdate.c
-rrdupdate_LDADD = librrdupd.la
+rrdupdate_LDADD = librrdupd.la -lintl -lpthread
 rrdtool_SOURCES = rrd_tool.c
 rrdtool_DEPENDENCIES = librrd.la
 rrdtool_LDADD = librrd.la