From owner-svn-ports-branches@FreeBSD.ORG  Sat Jan 25 10:37:28 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3CC9D1DF;
 Sat, 25 Jan 2014 10:37:28 +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 2844814E0;
 Sat, 25 Jan 2014 10:37:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAbSu4050525;
 Sat, 25 Jan 2014 10:37:28 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAbSuB050524;
 Sat, 25 Jan 2014 10:37:28 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401251037.s0PAbSuB050524@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 10:37:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r341004 - in branches/2014Q1/audio/xmms-modplug: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 10:37:28 -0000

Author: miwi
Date: Sat Jan 25 10:37:27 2014
New Revision: 341004
URL: http://svnweb.freebsd.org/changeset/ports/341004
QAT: https://qat.redports.org/buildarchive/r341004/

Log:
  MFH: r340232
  
  - Fix build with clang
  
  PR:		185313
  Submitted by:	Ports Fury

Added:
  branches/2014Q1/audio/xmms-modplug/files/
     - copied from r340232, head/audio/xmms-modplug/files/
Modified:
  branches/2014Q1/audio/xmms-modplug/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/xmms-modplug/Makefile
==============================================================================
--- branches/2014Q1/audio/xmms-modplug/Makefile	Sat Jan 25 10:35:51 2014	(r341003)
+++ branches/2014Q1/audio/xmms-modplug/Makefile	Sat Jan 25 10:37:27 2014	(r341004)
@@ -12,21 +12,23 @@ DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ModPlug-based plugin for XMMS
 
-LIB_DEPENDS?=	libxmms.so:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+BUILD_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+RUN_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
 
 USES=		pkgconfig
-NO_STAGE=	yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-HAS_CONFIGURE=	yes
-PLUGDIR?=	lib/xmms/Input
-PLIST_FILES=	${PLUGDIR}/libmodplugxmms.so
+
+PLIST_FILES=	lib/xmms/Input/libmodplugxmms.so
 
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/modplugxmms/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/modplugxmms/.libs/libmodplugxmms.so \
-		${PREFIX}/${PLUGDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
+	(cd ${WRKSRC}/modplugxmms/.libs && ${INSTALL_LIB} libmodplugxmms.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Input)
 
 .include <bsd.port.mk>