audio/pd: some fixes

- repair the loading of external objects
- reduce portlint complaints

PR:		206965
Submitted by:	Tobias Brodel <brittlehaus@gmail.com>

4 files changed, 53 insertions, 18 deletions

diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 2735856bcae8..ecdac6faf874 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pd
+PORTREVISION=	1
 DISTVERSION=	0.46-7
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	audio
@@ -41,49 +42,49 @@ JACK_CONFIGURE_ENABLE=	jack
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 post-patch:
-	@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+	${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|__FreeBSD_kernel__|__FreeBSD__|g ; \
 		 s|__x86_64__|__amd64__|g ; \
 		 s|<alloca\.h>|<stdlib.h>|g'
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|\*kfreebsd\*gnu\*)|*freebsd*)| ; \
 		 s|portaudio=yes|portaudio=no| ; \
 		 s|-O3||' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		'/^pkgconfigdir/s|=.*|= $$(prefix)/libdata/pkgconfig| ; \
 		 /^libpddir/s|=.*|= $$(pkglibdir)| ; \
 		 s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		'/^pd_LDADD/s| =.*| = $$(LIBM)|' ${WRKSRC}/src/Makefile.am
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|PD_BASEDIR/LICENSE|${DOCSDIR}/LICENSE|g ; \
 		 s|PD_BASEDIR/doc/1|${DOCSDIR}/1|g' \
 			${WRKSRC}/doc/1.manual/1.introduction.txt
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|-O2 | | ; \
 		 s|-lc ||g' ${WRKSRC}/extra/makefile.subdir
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|-O2 |$$(CFLAGS) | ; \
 		 s|-g ||g ; \
 		 s|-lc ||g' ${WRKSRC}/extra/expr~/makefile
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		'/libpthread/s|_ERROR|_WARN|' ${WRKSRC}/portaudio/configure.in
 
 do-install:
 .for i in src man tcl po extra
-	@(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 	(cd ${WRKSRC} && ${INSTALL_DATA} pd.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(${TAR} -C ${WRKSRC}/doc --exclude "*.bak" --exclude "*.orig" \
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(${TAR} -C ${WRKSRC}/doc --exclude "*.bak" --exclude "*.orig" \
 		-cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -)
 .for i in LICENSE.txt README.txt
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${PREFIX}/lib/pd/doc
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/pd -name "*.pd_linux" | ${XARGS} \
+	${LN} -sf ${DOCSDIR} ${STAGEDIR}${PREFIX}/lib/pd/doc
+	${FIND} ${STAGEDIR}${PREFIX}/lib/pd -name "*.pd_linux" | ${XARGS} \
 		${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/audio/pd/files/patch-src_s_audio_alsa.c b/audio/pd/files/patch-src_s__audio__alsa.c
index 29fc3b360a86..7bbf1b3b55bf 100644
--- a/audio/pd/files/patch-src_s_audio_alsa.c
+++ b/audio/pd/files/patch-src_s__audio__alsa.c
@@ -1,5 +1,5 @@
---- src/s_audio_alsa.c.orig	2011-11-07 13:06:38.000000000 +0900
-+++ src/s_audio_alsa.c	2012-02-26 03:12:50.000000000 +0900
+--- src/s_audio_alsa.c.orig	2014-09-18 00:09:56 UTC
++++ src/s_audio_alsa.c
 @@ -25,7 +25,14 @@
  #include <sched.h>
  #include <sys/mman.h>
diff --git a/audio/pd/files/patch-src_s__loader.c b/audio/pd/files/patch-src_s__loader.c
new file mode 100644
index 000000000000..79385411a5ef
--- /dev/null
+++ b/audio/pd/files/patch-src_s__loader.c
@@ -0,0 +1,34 @@
+--- src/s_loader.c.orig	2014-08-18 00:35:53 UTC
++++ src/s_loader.c
+@@ -2,7 +2,7 @@
+ * For information on usage and redistribution, and for a DISCLAIMER OF ALL
+ * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
+ 
+-#ifdef HAVE_LIBDL
++#if defined(HAVE_LIBDL) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+@@ -37,11 +37,9 @@ objects.  The specific name is the lette
+ darwin, or microsoft, followed by a more specific string, either "fat" for
+ a fat binary or an indication of the instruction set. */
+ 
+-#ifdef __FreeBSD__
+-static char sys_dllextent[] = ".b_i386", sys_dllextent2[] = ".pd_freebsd";
+-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD__)
+ static char sys_dllextent2[] = ".pd_linux";
+-# ifdef __x86_64__
++# ifdef __amd64__
+ static char sys_dllextent[] = ".l_ia64"; // this should be .l_x86_64 or .l_amd64
+ # elif defined(__i386__) || defined(_M_IX86)
+ static char sys_dllextent[] = ".l_i386";
+@@ -216,7 +214,7 @@ gotone:
+              makeout = (t_xxx)GetProcAddress(ntdll, "setup");
+         SetDllDirectory(NULL); /* reset DLL dir to nothing */
+     }
+-#elif defined HAVE_LIBDL
++#elif defined(HAVE_LIBDL) || defined(__FreeBSD__)
+     dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+     if (!dlobj)
+     {
diff --git a/audio/pd/files/patch-src_s_main.c b/audio/pd/files/patch-src_s__main.c
index 952a7ed0694e..39f08ba89dd0 100644
--- a/audio/pd/files/patch-src_s_main.c
+++ b/audio/pd/files/patch-src_s__main.c
@@ -1,6 +1,6 @@
---- src/s_main.c.orig	2011-03-07 10:11:02.000000000 +0900
-+++ src/s_main.c	2011-04-06 19:30:04.000000000 +0900
-@@ -936,7 +940,11 @@
+--- src/s_main.c.orig	2015-09-09 23:08:21 UTC
++++ src/s_main.c
+@@ -1137,7 +1137,11 @@ static void sys_afterargparse(void)
              /* add "doc/5.reference" library to helppath */
      strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
      sbuf[MAXPDSTRING-30] = 0;