Fix build on -current;

Fix detection of freetype library.

PR:		36657
Submitted by:	MAINTAINER

6 files changed, 56 insertions, 2 deletions

diff --git a/audio/freeamp/Makefile b/audio/freeamp/Makefile
index 1b39c431a0f0..483d35c3af4e 100644
--- a/audio/freeamp/Makefile
+++ b/audio/freeamp/Makefile
@@ -24,7 +24,8 @@ USE_GTK=	yes
 WANT_ESOUND=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=213
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+			-I${LOCALBASE}/include/freetype1" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.pre.mk>
@@ -70,6 +71,12 @@ pre-everything::
 	@${ECHO_MSG} "WITH_ALL_PLUGINS=yes  build with all plugins"
 	@${ECHO_MSG}
 
+# Stop a flood of complaints and PRs from people who can't be bothered 
+# to keep their ports and packages up to date.
+pre-extract:
+	@test -d ${LOCALBASE}/include/freetype1/freetype && true \
+	  || { echo '===> UPGRADE print/freetype TO CURRENT VERSION!';false; }
+
 post-install:
 	@${MKDIR} ${PREFIX}/etc/sdr/plugins
 	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.freeamp \
diff --git a/audio/freeamp/files/patch-io-signature-src-signaturepmo.cpp b/audio/freeamp/files/patch-io-signature-src-signaturepmo.cpp
new file mode 100644
index 000000000000..c16ea2f477e1
--- /dev/null
+++ b/audio/freeamp/files/patch-io-signature-src-signaturepmo.cpp
@@ -0,0 +1,10 @@
+--- ./io/signature/src/signaturepmo.cpp.orig	Thu Oct 26 18:51:32 2000
++++ ./io/signature/src/signaturepmo.cpp	Sun Apr  7 01:40:32 2002
+@@ -27,7 +27,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ /* project headers */
+ #include "config.h"
diff --git a/audio/freeamp/files/patch-io-wavout-src-waveoutpmo.cpp b/audio/freeamp/files/patch-io-wavout-src-waveoutpmo.cpp
new file mode 100644
index 000000000000..75775fe32538
--- /dev/null
+++ b/audio/freeamp/files/patch-io-wavout-src-waveoutpmo.cpp
@@ -0,0 +1,10 @@
+--- ./io/wavout/src/wavoutpmo.cpp.orig	Tue Oct 16 01:23:08 2001
++++ ./io/wavout/src/wavoutpmo.cpp	Sun Apr  7 01:40:28 2002
+@@ -28,7 +28,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ /* project headers */
+ #include "config.h"
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 1b39c431a0f0..483d35c3af4e 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -24,7 +24,8 @@ USE_GTK=	yes
 WANT_ESOUND=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=213
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+			-I${LOCALBASE}/include/freetype1" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.pre.mk>
@@ -70,6 +71,12 @@ pre-everything::
 	@${ECHO_MSG} "WITH_ALL_PLUGINS=yes  build with all plugins"
 	@${ECHO_MSG}
 
+# Stop a flood of complaints and PRs from people who can't be bothered 
+# to keep their ports and packages up to date.
+pre-extract:
+	@test -d ${LOCALBASE}/include/freetype1/freetype && true \
+	  || { echo '===> UPGRADE print/freetype TO CURRENT VERSION!';false; }
+
 post-install:
 	@${MKDIR} ${PREFIX}/etc/sdr/plugins
 	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.freeamp \
diff --git a/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp b/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
new file mode 100644
index 000000000000..c16ea2f477e1
--- /dev/null
+++ b/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
@@ -0,0 +1,10 @@
+--- ./io/signature/src/signaturepmo.cpp.orig	Thu Oct 26 18:51:32 2000
++++ ./io/signature/src/signaturepmo.cpp	Sun Apr  7 01:40:32 2002
+@@ -27,7 +27,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ /* project headers */
+ #include "config.h"
diff --git a/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp b/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp
new file mode 100644
index 000000000000..75775fe32538
--- /dev/null
+++ b/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp
@@ -0,0 +1,10 @@
+--- ./io/wavout/src/wavoutpmo.cpp.orig	Tue Oct 16 01:23:08 2001
++++ ./io/wavout/src/wavoutpmo.cpp	Sun Apr  7 01:40:28 2002
+@@ -28,7 +28,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ /* project headers */
+ #include "config.h"