Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jan 2014 08:55:02 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
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
Message-ID:  <201401190855.s0J8t2qG011955@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



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