Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Mar 2002 15:37:01 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/35613: Update port: audio/libmikmod to 3.1.10
Message-ID:  <200203062337.g26Nb1s63598@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         35613
>Category:       ports
>Synopsis:       Update port: audio/libmikmod to 3.1.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 06 15:40:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 3.1.10

Remove file:
files/patch-ab
files/patch-ac

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/audio/libmikmod/Makefile audio/libmikmod/Makefile
--- /usr/ports/audio/libmikmod/Makefile	Sat Dec 29 17:24:07 2001
+++ audio/libmikmod/Makefile	Thu Mar  7 04:06:52 2002
@@ -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}|g ; \
+		 s|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/libmikmod/distinfo audio/libmikmod/distinfo
--- /usr/ports/audio/libmikmod/distinfo	Wed Mar  8 06:08:37 2000
+++ audio/libmikmod/distinfo	Thu Mar  7 00:59:17 2002
@@ -1 +1 @@
-MD5 (libmikmod-3.1.9.tar.gz) = 0d50670d34653490a0c87a9fa5cc804a
+MD5 (libmikmod-3.1.10.tar.gz) = 14bf3f18cf0187f5dab46e42a3ddda84
diff -urN /usr/ports/audio/libmikmod/files/patch-ab audio/libmikmod/files/patch-ab
--- /usr/ports/audio/libmikmod/files/patch-ab	Wed Mar  8 06:08:37 2000
+++ audio/libmikmod/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/audio/libmikmod/files/patch-ac audio/libmikmod/files/patch-ac
--- /usr/ports/audio/libmikmod/files/patch-ac	Wed Mar  8 06:08:38 2000
+++ audio/libmikmod/files/patch-ac	Thu Jan  1 09:00:00 1970
@@ -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
- 		
- # =================

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203062337.g26Nb1s63598>