Attachment 44746 Details for Bug 69184 – file.diff

[patch] file.diff

file.diff (text/plain), 8.15 KB, created by tkato432 on 2004-07-17 15:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2004-07-17 15:10:08 UTC

Size: 8.15 KB

patch

obsolete

>diff -urN /usr/ports/audio/libsidplay2/Makefile audio/libsidplay2/Makefile
>--- /usr/ports/audio/libsidplay2/Makefile	Wed Feb  4 18:55:22 2004
>+++ audio/libsidplay2/Makefile	Sat Jul 17 02:13:53 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libsidplay2
>-PORTVERSION=	2.1.0
>-PORTREVISION=	1
>+PORTVERSION=	2.1.1
> CATEGORIES=	audio emulators
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	sidplay2
>@@ -19,7 +18,12 @@
> USE_GNOME=	gnomehack gnometarget pkgconfig
> USE_GMAKE=	yes
> USE_REINPLACE=	yes
>-GNU_CONFIGURE=	yes
>+USE_LIBTOOL_VER=	15
>+LIBTOOLFILES=	builders/hardsid-builder/configure \
>+		builders/resid-builder/configure \
>+		libsidplay/configure \
>+		libsidutils/configure \
>+		resid/configure
> INSTALLS_SHLIB=	yes
> 
> post-patch:
>diff -urN /usr/ports/audio/libsidplay2/distinfo audio/libsidplay2/distinfo
>--- /usr/ports/audio/libsidplay2/distinfo	Wed Jan 28 18:44:54 2004
>+++ audio/libsidplay2/distinfo	Fri Jul 16 23:14:26 2004
>@@ -1,2 +1,2 @@
>-MD5 (sidplay-libs-2.1.0.tar.gz) = 40e61c8edbce16e1a8d0e31169869d99
>-SIZE (sidplay-libs-2.1.0.tar.gz) = 1135771
>+MD5 (sidplay-libs-2.1.1.tar.gz) = 7ea0ba5dc1da4604d15eaae001f7d2a7
>+SIZE (sidplay-libs-2.1.1.tar.gz) = 1900252
>diff -urN /usr/ports/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh
>--- /usr/ports/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh	Sun Feb  2 21:15:14 2003
>+++ audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>---- builders/resid-builder/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
>-+++ builders/resid-builder/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
>-@@ -1221,7 +1221,7 @@
>- 	    # These systems don't actually have a C library (as such)
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>- 	    continue
>- 	    ;;
>-@@ -1233,7 +1233,7 @@
>- 	fi
>-         if test "X$arg" = "X-lc_r"; then
>-          case $host in
>--         *-*-openbsd*)
>-+         *-*-openbsd* | *-*-freebsd*)
>-            # Do not include libc_r directly, use -pthread flag.
>-            continue
>-            ;;
>-@@ -2814,7 +2814,7 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>--          *-*-openbsd*)
>-+          *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>-             ;;
>-  	  *)
>-@@ -4672,10 +4672,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"
>diff -urN /usr/ports/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh
>--- /usr/ports/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh	Sun Feb  2 21:15:14 2003
>+++ audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>---- libsidplay/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
>-+++ libsidplay/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
>-@@ -1221,7 +1221,7 @@
>- 	    # These systems don't actually have a C library (as such)
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>- 	    continue
>- 	    ;;
>-@@ -1233,7 +1233,7 @@
>- 	fi
>-         if test "X$arg" = "X-lc_r"; then
>-          case $host in
>--         *-*-openbsd*)
>-+         *-*-openbsd* | *-*-freebsd*)
>-            # Do not include libc_r directly, use -pthread flag.
>-            continue
>-            ;;
>-@@ -2814,7 +2814,7 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>--          *-*-openbsd*)
>-+          *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>-             ;;
>-  	  *)
>-@@ -4672,10 +4672,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"
>diff -urN /usr/ports/audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh
>--- /usr/ports/audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh	Sun Feb  2 21:15:14 2003
>+++ audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>---- libsidutils/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
>-+++ libsidutils/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
>-@@ -1221,7 +1221,7 @@
>- 	    # These systems don't actually have a C library (as such)
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>- 	    continue
>- 	    ;;
>-@@ -1233,7 +1233,7 @@
>- 	fi
>-         if test "X$arg" = "X-lc_r"; then
>-          case $host in
>--         *-*-openbsd*)
>-+         *-*-openbsd* | *-*-freebsd*)
>-            # Do not include libc_r directly, use -pthread flag.
>-            continue
>-            ;;
>-@@ -2814,7 +2814,7 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>--          *-*-openbsd*)
>-+          *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>-             ;;
>-  	  *)
>-@@ -4672,10 +4672,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"
>diff -urN /usr/ports/audio/libsidplay2/files/patch-unix::ltmain.sh audio/libsidplay2/files/patch-unix::ltmain.sh
>--- /usr/ports/audio/libsidplay2/files/patch-unix::ltmain.sh	Sun Feb  2 21:15:14 2003
>+++ audio/libsidplay2/files/patch-unix::ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>---- unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
>-+++ unix/ltmain.sh	Wed Jan 22 04:51:36 2003
>-@@ -1221,7 +1221,7 @@
>- 	    # These systems don't actually have a C library (as such)
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>- 	    continue
>- 	    ;;
>-@@ -1233,7 +1233,7 @@
>- 	fi
>-         if test "X$arg" = "X-lc_r"; then
>-          case $host in
>--         *-*-openbsd*)
>-+         *-*-openbsd* | *-*-freebsd*)
>-            # Do not include libc_r directly, use -pthread flag.
>-            continue
>-            ;;
>-@@ -2814,7 +2814,7 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>--          *-*-openbsd*)
>-+          *-*-openbsd* | *-*-freebsd*)
>- 	    # OpenBSD uses either libc or libc_r.
>-             ;;
>-  	  *)
>-@@ -4672,10 +4672,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"
>diff -urN /usr/ports/audio/libsidplay2/pkg-plist audio/libsidplay2/pkg-plist
>--- /usr/ports/audio/libsidplay2/pkg-plist	Tue Feb  4 20:48:46 2003
>+++ audio/libsidplay2/pkg-plist	Sat Jul 17 02:01:33 2004
>@@ -25,6 +25,8 @@
> lib/libsidutils.so
> lib/libsidutils.so.0
> lib/sidplay/builders/libresid-builder.a
>+lib/sidplay/builders/libresid-builder.so
>+lib/sidplay/builders/libresid-builder.so.0
> libdata/pkgconfig/libsidplay2.pc
> libdata/pkgconfig/libsidutils.pc
> @dirrm lib/sidplay/builders

Actions: View | Diff

Attachments on bug 69184: 44746