Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2013 05:46:34 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/185328: audio/xmms-modplug: Fix build with clang
Message-ID:  <20131231054634.8a90b318df6ba7b800407160@yahoo.com>
Resent-Message-ID: <201312302110.rBULA68c098742@freefall.freebsd.org>

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

>Number:         185328
>Category:       ports
>Synopsis:       audio/xmms-modplug: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 21:10:05 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

New file:
files/patch-modplugxmms__modplugxmms.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/xmms-modplug/Makefile audio/xmms-modplug/Makefile
--- /usr/ports/audio/xmms-modplug/Makefile	2013-12-12 02:41:41.000000000 +0900
+++ audio/xmms-modplug/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -12,21 +12,23 @@
 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>
diff -urN /usr/ports/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h
--- /usr/ports/audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h	1970-01-01 09:00:00.000000000 +0900
+++ audio/xmms-modplug/files/patch-modplugxmms__modplugxmms.h	2013-12-31 00:00:00.000000000 +0900
@@ -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"
>Release-Note:
>Audit-Trail:
>Unformatted:



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