Attachment 139146 Details for Bug 185337 – file.diff

[patch] file.diff

file.diff (text/plain), 4.09 KB, created by tkato432 on 2013-12-30 21:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-12-30 21:10:08 UTC

Size: 4.09 KB

patch

obsolete

>diff -urN /usr/ports/graphics/xmms-fishmatic/Makefile graphics/xmms-fishmatic/Makefile
>--- /usr/ports/graphics/xmms-fishmatic/Makefile	2013-11-06 22:02:06.000000000 +0900
>+++ graphics/xmms-fishmatic/Makefile	2013-12-31 00:00:00.000000000 +0900
>@@ -11,27 +11,33 @@
> 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>
>diff -urN /usr/ports/graphics/xmms-fishmatic/files/patch-configure graphics/xmms-fishmatic/files/patch-configure
>--- /usr/ports/graphics/xmms-fishmatic/files/patch-configure	2013-11-06 22:02:06.000000000 +0900
>+++ graphics/xmms-fishmatic/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,22 +0,0 @@
>-$FreeBSD: head/graphics/xmms-fishmatic/files/patch-configure 300896 2012-07-14 13:54:48Z beat $
>-
>---- configure.orig	Sun Aug 12 19:11:07 2001
>-+++ configure	Thu Dec 27 00:05:42 2001
>-@@ -3243,7 +3243,7 @@
>- #include "confdefs.h"
>- #include <GL/gl.h>
>- EOF
>--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>-+ac_try="$ac_cpp $CFLAGS conftest.$ac_ext >/dev/null 2>conftest.out"
>- { (eval echo configure:3248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>- if test -z "$ac_err"; then
>-@@ -3364,7 +3364,7 @@
>- #include "confdefs.h"
>- #include <GL/glx.h>
>- EOF
>--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>-+ac_try="$ac_cpp $CFLAGS conftest.$ac_ext >/dev/null 2>conftest.out"
>- { (eval echo configure:3369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>- if test -z "$ac_err"; then
>diff -urN /usr/ports/graphics/xmms-fishmatic/files/patch-ltmain.sh graphics/xmms-fishmatic/files/patch-ltmain.sh
>--- /usr/ports/graphics/xmms-fishmatic/files/patch-ltmain.sh	2013-11-06 22:02:06.000000000 +0900
>+++ graphics/xmms-fishmatic/files/patch-ltmain.sh	1970-01-01 09:00:00.000000000 +0900
>@@ -1,27 +0,0 @@
>-$FreeBSD: head/graphics/xmms-fishmatic/files/patch-ltmain.sh 300896 2012-07-14 13:54:48Z beat $
>-
>---- ltmain.sh	2001/08/27 09:51:26	1.1
>-+++ ltmain.sh	2001/08/27 09:51:42
>-@@ -2408,6 +2408,9 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>-+	  *-*-freebsd*)
>-+	    # FreeBSD doesn't need this...
>-+	    ;;
>- 	  *)
>- 	    # Add libc to deplibs on all other systems if necessary.
>- 	    if test "$build_libtool_need_lc" = "yes"; then
>-@@ -4175,10 +4178,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $instname $destdir/$name"
>- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Actions: View | Diff

Attachments on bug 185337: 139146