185337 – graphics/xmms-fishmatic: Fix build with clang

Bug 185337 - graphics/xmms-fishmatic: Fix build with clang

Summary: graphics/xmms-fishmatic: Fix build with clang

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	freebsd-ports-bugs (Nobody)

URL:
Keywords:

Depends on:
Blocks:

Reported:	2013-12-30 21:10 UTC by tkato432
Modified:	2014-01-25 10:40 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (4.09 KB, patch) 2013-12-30 21:10 UTC, tkato432	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description tkato432 2013-12-30 21:10:08 UTC

- Fix build with clang

Remove file:
files/patch-configure
files/patch-ltmain.sh

Comment 1 Martin Wilke freebsd_committer

2014-01-19 08:56:57 UTC

State Changed
From-To: open->closed

Committed. Thanks!

Comment 2 dfilter service freebsd_committer

2014-01-19 08:57:05 UTC

Author: miwi
Date: Sun Jan 19 08:56:58 2014
New Revision: 340233
URL: http://svnweb.freebsd.org/changeset/ports/340233
QAT: https://qat.redports.org/buildarchive/r340233/

Log:
  - Fix build with clang
  
  PR:		185337

Deleted:
  head/graphics/xmms-fishmatic/files/
Modified:
  head/graphics/xmms-fishmatic/Makefile   (contents, props changed)

Modified: head/graphics/xmms-fishmatic/Makefile
==============================================================================
--- head/graphics/xmms-fishmatic/Makefile	Sun Jan 19 08:55:01 2014	(r340232)
+++ head/graphics/xmms-fishmatic/Makefile	Sun Jan 19 08:56:58 2014	(r340233)
@@ -11,27 +11,33 @@ DISTNAME=	fishmatic
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS non-static OpenGL stereogram visualization plugin
 
-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
 
-PLIST_FILES=	lib/xmms/Visualization/libfishmatic.so
-USE_GNOME=      gtk12
 USES=		gmake pkgconfig
-GNU_CONFIGURE=  yes
-USE_GL=		glut
 USE_XORG=	xext
-USE_LDCONFIG=	yes
+USE_GNOME=      gtk12
+USE_GL=		glut
+USE_AUTOTOOLS=	libtool
 
-CONFIGURE_ENV=	LIBS="-lGL -lXext ${LIBS}"
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	lib/xmms/Visualization/libfishmatic.so
 
-NO_STAGE=	yes
 post-patch:
+	@${REINPLACE_CMD} -e \
+		's|"-lpthread|"-pthread|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-O2|| ; \
+		 s|@PNG_LIBS@||' ${WRKSRC}/Makefile.in
+
+pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
-	@${REINPLACE_CMD} -e 's|-O2||; \
-		s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization
+	(cd ${WRKSRC}/.libs && ${INSTALL_LIB} libfishmatic.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Visualization)
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 dfilter service freebsd_committer

2014-01-25 10:39:43 UTC

Author: miwi
Date: Sat Jan 25 10:39:36 2014
New Revision: 341005
URL: http://svnweb.freebsd.org/changeset/ports/341005
QAT: https://qat.redports.org/buildarchive/r341005/

Log:
  MFH: r340233
  
  - Fix build with clang
  
  PR:		185337

Deleted:
  branches/2014Q1/graphics/xmms-fishmatic/files/
Modified:
  branches/2014Q1/graphics/xmms-fishmatic/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/xmms-fishmatic/Makefile
==============================================================================
--- branches/2014Q1/graphics/xmms-fishmatic/Makefile	Sat Jan 25 10:37:27 2014	(r341004)
+++ branches/2014Q1/graphics/xmms-fishmatic/Makefile	Sat Jan 25 10:39:36 2014	(r341005)
@@ -11,27 +11,33 @@ DISTNAME=	fishmatic
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS non-static OpenGL stereogram visualization plugin
 
-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS=	xmms>0:${PORTSDIR}/multimedia/xmms
 
-PLIST_FILES=	lib/xmms/Visualization/libfishmatic.so
-USE_GNOME=      gtk12
 USES=		gmake pkgconfig
-GNU_CONFIGURE=  yes
-USE_GL=		glut
 USE_XORG=	xext
-USE_LDCONFIG=	yes
+USE_GNOME=      gtk12
+USE_GL=		glut
+USE_AUTOTOOLS=	libtool
 
-CONFIGURE_ENV=	LIBS="-lGL -lXext ${LIBS}"
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	lib/xmms/Visualization/libfishmatic.so
 
-NO_STAGE=	yes
 post-patch:
+	@${REINPLACE_CMD} -e \
+		's|"-lpthread|"-pthread|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-O2|| ; \
+		 s|@PNG_LIBS@||' ${WRKSRC}/Makefile.in
+
+pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
-	@${REINPLACE_CMD} -e 's|-O2||; \
-		s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization
+	(cd ${WRKSRC}/.libs && ${INSTALL_LIB} libfishmatic.so \
+		${STAGEDIR}${PREFIX}/lib/xmms/Visualization)
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"