Attachment 22815 Details for Bug 39485 – file.diff

[patch] file.diff

file.diff (text/plain), 4.33 KB, created by tkato on 2002-06-18 21:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-06-18 21:40:02 UTC

Size: 4.33 KB

patch

obsolete

>diff -urN /usr/ports/x11-toolkits/paragui/Makefile x11-toolkits/paragui/Makefile
>--- /usr/ports/x11-toolkits/paragui/Makefile	Thu Apr 18 20:24:29 2002
>+++ x11-toolkits/paragui/Makefile	Tue Jun 18 21:39:21 2002
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	paragui
>-PORTVERSION=	1.0.1
>+PORTVERSION=	1.0.2
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	ftp://ftp.bms-austria.com/pub/paragui/release/
> 
>@@ -21,7 +21,8 @@
> SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> 
> USE_X_PREFIX=	yes
>-GNU_CONFIGURE=	yes
>+USE_LIBTOOL=	yes
>+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
> CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
> 		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
> 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>@@ -34,10 +35,10 @@
> 	@${RM} -f ${WRKSRC}/src/physfs/platform.c
> 
> post-patch:
>-	@${PERL} -pi -e 's|LT_CURRENT=.*$$|LT_CURRENT=${SHLIB_VER}|g ; \
>+	@${REINPLACE_CMD} -e 's|LT_CURRENT=.*$$|LT_CURRENT=${SHLIB_VER}|g ; \
> 		 s|`sdl-config |`\$$\{SDL_CONFIG\} |g' ${WRKSRC}/configure
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|\$$$SDL_CFLAGS$|\$$$PARAGUI_CFLAGS$|g ; \
>-		 s|-release \$$$LT_RELEASE$||g'
>+		 s|lib/pkgconfig|libdata/pkgconfig|g'
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-toolkits/paragui/distinfo x11-toolkits/paragui/distinfo
>--- /usr/ports/x11-toolkits/paragui/distinfo	Tue Apr  9 07:49:50 2002
>+++ x11-toolkits/paragui/distinfo	Tue Jun 18 20:00:57 2002
>@@ -1 +1 @@
>-MD5 (paragui-1.0.1.tar.gz) = d08bc4f48600fabcfa03e796c3bc04d5
>+MD5 (paragui-1.0.2.tar.gz) = 604f08e26fc459f41ce689e97694cd58
>diff -urN /usr/ports/x11-toolkits/paragui/files/patch-configure x11-toolkits/paragui/files/patch-configure
>--- /usr/ports/x11-toolkits/paragui/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ x11-toolkits/paragui/files/patch-configure	Tue Jun 18 20:05:32 2002
>@@ -0,0 +1,10 @@
>+--- configure.orig	Mon Jun 10 18:05:42 2002
>++++ configure	Tue Jun 18 20:05:24 2002
>+@@ -5618,6 +5618,7 @@
>+ 
>+ # This can be used to rebuild libtool when needed
>+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
>+ 
>+ # Always use our own libtool.
>+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>diff -urN /usr/ports/x11-toolkits/paragui/files/patch-ltmain.sh x11-toolkits/paragui/files/patch-ltmain.sh
>--- /usr/ports/x11-toolkits/paragui/files/patch-ltmain.sh	Sun Mar  3 16:24:56 2002
>+++ x11-toolkits/paragui/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,41 +0,0 @@
>---- ltmain.sh.orig	Mon Feb 11 17:35:31 2002
>-+++ ltmain.sh	Fri Mar  1 06:01:48 2002
>-@@ -1056,14 +1056,14 @@
>- 	    # These systems don't actually have a C library (as such)
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # Do not include libc due to us having libc/libc_r.
>- 	    test "X$arg" = "X-lc" && continue
>- 	    ;;
>- 	  esac
>- 	 elif test "X$arg" = "X-lc_r"; then
>- 	  case $host in
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # Do not include libc_r directly, use -pthread flag.
>- 	    continue
>- 	    ;;
>-@@ -2494,7 +2494,7 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>--	  *-*-openbsd*)
>-+	  *-*-openbsd* | *-*-freebsd*)
>- 	    # Do not include libc due to us having libc/libc_r.
>- 	    ;;
>- 	  *)
>-@@ -4281,10 +4281,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/x11-toolkits/paragui/pkg-plist x11-toolkits/paragui/pkg-plist
>--- /usr/ports/x11-toolkits/paragui/pkg-plist	Sun Mar  3 23:00:38 2002
>+++ x11-toolkits/paragui/pkg-plist	Wed Jun 19 00:26:51 2002
>@@ -13,6 +13,7 @@
> include/paragui/pgdraw.h
> include/paragui/pgdropdown.h
> include/paragui/pgeventobject.h
>+include/paragui/pgtimerobject.h
> include/paragui/pgfile.h
> include/paragui/pgfilearchive.h
> include/paragui/pgfont.h
>@@ -50,7 +51,7 @@
> lib/libparagui.a
> lib/libparagui.so
> lib/libparagui.so.%%SHLIB_VER%%
>-lib/pkgconfig/paragui.pc
>+libdata/pkgconfig/paragui.pc
> share/aclocal/paragui.m4
> share/paragui/default.zip
> share/paragui/simple.zip

Actions: View | Diff

Attachments on bug 39485: 22815