From owner-svn-ports-all@FreeBSD.ORG Wed Mar 12 19:49:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52E4AEEB; Wed, 12 Mar 2014 19:49:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 262D4954; Wed, 12 Mar 2014 19:49:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CJnwrD068411; Wed, 12 Mar 2014 19:49:58 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CJnvIo068409; Wed, 12 Mar 2014 19:49:57 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201403121949.s2CJnvIo068409@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 12 Mar 2014 19:49:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347999 - head/audio/libmikmod X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 19:49:58 -0000 Author: tijl Date: Wed Mar 12 19:49:57 2014 New Revision: 347999 URL: http://svnweb.freebsd.org/changeset/ports/347999 QAT: https://qat.redports.org/buildarchive/r347999/ Log: Reapply r338657 (disable esound) and r342886 (USES=libtool). [1] While here, remove post-extract and post-patch: no longer needed. Submitted by: riggs [1] Modified: head/audio/libmikmod/Makefile head/audio/libmikmod/pkg-plist Modified: head/audio/libmikmod/Makefile ============================================================================== --- head/audio/libmikmod/Makefile Wed Mar 12 19:33:50 2014 (r347998) +++ head/audio/libmikmod/Makefile Wed Mar 12 19:49:57 2014 (r347999) @@ -3,6 +3,7 @@ PORTNAME= libmikmod PORTVERSION= 3.1.16 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/mikmod/${PORTNAME}/${PORTVERSION}/ @@ -11,35 +12,11 @@ COMMENT= MikMod Sound Library LICENSE= LGPL21 -USE_AUTOTOOLS= libtool -WANT_GNOME= yes -USE_GNOME= lthack -USES= gmake pkgconfig +USES= gmake libtool pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --disable-esd USE_LDCONFIG= yes INFO= mikmod -.include - -.if ${HAVE_GNOME:Mesound}!="" -USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-esd -.else -CONFIGURE_ARGS+= --disable-esd -.endif - -post-extract: - @${RM} -f ${WRKSRC}/docs/mikmod.info-* - -post-patch: - @${REINPLACE_CMD} \ - -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g' \ - -e 's|-pthread \$$REENTRANT|\$$REENTRANT ${PTHREAD_CFLAGS}|g' \ - -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-pthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-lc_r|${PTHREAD_LIBS:S/"//g}|g' \ - ${WRKSRC}/configure - -.include +.include Modified: head/audio/libmikmod/pkg-plist ============================================================================== --- head/audio/libmikmod/pkg-plist Wed Mar 12 19:33:50 2014 (r347998) +++ head/audio/libmikmod/pkg-plist Wed Mar 12 19:49:57 2014 (r347999) @@ -4,6 +4,7 @@ lib/libmikmod.a lib/libmikmod.la lib/libmikmod.so lib/libmikmod.so.2 +lib/libmikmod.so.2.0.6 libdata/pkgconfig/libmikmod.pc -share/aclocal/libmikmod.m4 man/man1/libmikmod-config.1.gz +share/aclocal/libmikmod.m4