From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 19 08:55:02 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 9C280148;
 Sun, 19 Jan 2014 08:55:02 +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 6E3861ADC;
 Sun, 19 Jan 2014 08:55:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0J8t2nk011958;
 Sun, 19 Jan 2014 08:55:02 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0J8t2qG011955;
 Sun, 19 Jan 2014 08:55:02 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401190855.s0J8t2qG011955@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sun, 19 Jan 2014 08:55:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340232 - in head/audio/xmms-modplug: . files
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jan 2014 08:55:02 -0000

Author: miwi
Date: Sun Jan 19 08:55:01 2014
New Revision: 340232
URL: http://svnweb.freebsd.org/changeset/ports/340232
QAT: https://qat.redports.org/buildarchive/r340232/

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

Added:
  head/audio/xmms-modplug/files/
  head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h   (contents, props changed)
Modified:
  head/audio/xmms-modplug/Makefile   (contents, props changed)

Modified: head/audio/xmms-modplug/Makefile
==============================================================================
--- head/audio/xmms-modplug/Makefile	Sun Jan 19 08:53:58 2014	(r340231)
+++ head/audio/xmms-modplug/Makefile	Sun Jan 19 08:55:01 2014	(r340232)
@@ -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>

Added: head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h	Sun Jan 19 08:55:01 2014	(r340232)
@@ -0,0 +1,10 @@
+--- modplugxmms/modplugxmms.h.orig
++++ modplugxmms/modplugxmms.h
+@@ -8,6 +8,7 @@
+ #define __MODPLUGXMMS_CMODPLUGXMMS_H_INCLUDED__
+ 
+ #include <string>
++#include <pthread.h>
+ 
+ #ifndef __MODPLUGXMMS_STDDEFS_H__INCLUDED__
+ #include "stddefs.h"