4 files changed, 13 insertions, 62 deletions

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 7b65bf378908..006b2eca2e5b 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	libmikmod
-PORTVERSION=	3.1.9
+PORTVERSION=	3.1.10
 CATEGORIES=	audio
-MASTER_SITES=	http://www.mikmod.org/files/libmikmod/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sada
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		http://www.mikmod.org/files/libmikmod/
+MASTER_SITE_SUBDIR=	apps/sound/libs
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_ESOUND=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 INSTALLS_SHLIB=	yes
 
 MAN1=	libmikmod-config.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+post-extract:
+	@${RM} -f ${WRKSRC}/docs/mikmod.info-*
 
-pre-build:
-	${RM} -rf ${WRKSRC}/docs/mikmod.info-*
+post-patch:
+	@${PERL} -pi -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g ; \
+		 s|-pthread \$$REENTRANT|\$$REENTRANT ${PTHREAD_CFLAGS}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
+		 s|-lc_r|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index a6d0829f3517..e5803f5c56db 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1 +1 @@
-MD5 (libmikmod-3.1.9.tar.gz) = 0d50670d34653490a0c87a9fa5cc804a
+MD5 (libmikmod-3.1.10.tar.gz) = 14bf3f18cf0187f5dab46e42a3ddda84
diff --git a/audio/libmikmod/files/patch-ab b/audio/libmikmod/files/patch-ab
deleted file mode 100644
index fadb9528b18a..000000000000
--- a/audio/libmikmod/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig	Mon Feb 14 14:19:59 2000
-+++ docs/Makefile.in	Tue Mar  7 13:01:48 2000
-@@ -76,7 +76,7 @@
- LIB_LDADD = @LIB_LDADD@
- LN_S = @LN_S@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
- PLAYER_LIB = @PLAYER_LIB@
diff --git a/audio/libmikmod/files/patch-ac b/audio/libmikmod/files/patch-ac
deleted file mode 100644
index e71ae8aaebbe..000000000000
--- a/audio/libmikmod/files/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	Mon Feb 14 12:20:17 2000
-+++ configure	Tue Mar  7 13:04:53 2000
-@@ -2063,14 +2063,14 @@
-   libmikmod_threads=-lpthread
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:2068: checking for pthread_create in -lc_r" >&5
--ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-+echo "configure:2068: checking for pthread_create in -lpthread" >&5
-+ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lc_r  $LIBS"
-+LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2076 "configure"
- #include "confdefs.h"
-@@ -2098,7 +2098,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  libmikmod_threads=-lc_r
-+  libmikmod_threads=-pthread
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -3790,9 +3790,9 @@
- #define HAVE_PTHREAD 1
- EOF
- 
--	CFLAGS="$CFLAGS -D_REENTRANT"
-+	CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
- 	LIBRARY_LIB="$libmikmod_threads $LIBRARY_LIB"
--	REENTRANT="-D_REENTRANT"
-+	REENTRANT="-D_REENTRANT -D_THREAD_SAFE"
- fi
- 		
- # =================