Attachment #23285 for bug #40083

View | Details | Raw Unified | Return to bug 40083
Collapse All | Expand All




#

PORTNAME=	libuta
PORTVERSION=	0.4.1
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	lehmann@ans-netz.de

LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
		sigc.1:${PORTSDIR}/devel/libsigc++ \
		SDL-1.1.4:${PORTSDIR}/devel/sdl12
		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer

USE_FREETYPE=	yes
USE_LIBTOOL=	yes
GNU_CONFIGURE=	yes
USE_REINPLACE=	yes

CONFIGURE_ENV=	SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \
		LIBS="-L${LOCALBASE}/lib"

SDL11_FILES=	configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
		uta/pixelformat.h uta/rect.h uta/sge_blib.cc uta/sge_blib.h \
		uta/sge_draw.cc uta/sge_draw.h uta/sound.h uta/surface_io.cc \
		uta/surface.h uta/timer.cc

.include <bsd.port.pre.mk>

.if exists(${LOCALBASE}/lib/libSDL_mixer.so.2)
WITH_SDL_MIXER=	yes
.endif

.if defined(WITH_SDL_MIXER)
LIB_DEPENDS+=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
.endif


pre-everything::
	@${ECHO} ""
	@${ECHO} "You may use the following build options:"
	@${ECHO} ""
	@${ECHO} "      WITH_SDL_MIXER=yes   Enable music and sound support"
	@${ECHO} ""

post-patch:
.for i in ${SDL11_FILES}
	${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/$i
.endfor

.include <bsd.port.post.mk>

Line 1 Link Here

(-)/usr/ports/devel/libuta/distinfo (-1 / +1 lines)
1	MD5 (libuta-0.3.38.tar.gz) = 19e9b692fa046fb7c8e16c5cceaea232	1	MD5 (libuta-0.4.1.tar.gz) = 102eebdf70941cd11ed36af9ba8726d6





$FreeBSD: ports/devel/libuta/files/patch-aa,v 1.4 2002/03/14 11:16:38 sobomax Exp $

--- configure.orig	Thu Apr 12 12:21:35 2001
+++ configure	Thu Mar 14 13:09:31 2002
@@ -7,6 +7,9 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
+LIBS="$LIBS -L/usr/local/lib"
+SDL_CONFIG="/usr/local/bin/sdl11-config"
+
 # Defaults:
 ac_help=
 ac_default_prefix=/usr/local
@@ -3573,7 +3576,7 @@
 
 CFLAGS=
 CXXFLAGS=
-CPPFLAGS=-Wall
+CPPFLAGS="$CPPFLAGS -Wall"
 
 case $win32 in
     true)
@@ -4603,7 +4606,7 @@
     no_sdl=yes
   else
     SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs | sed 's/-lXxf86vm -lXxf86dga -lXv //g'`
 
     sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -4627,7 +4630,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 char*
 my_strdup (char *str)
@@ -4717,7 +4720,7 @@
 #include "confdefs.h"
 
 #include <stdio.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 int main() {
  return 0; 
@@ -5042,7 +5045,7 @@
   cat > conftest.$ac_ext <<EOF
 #line 5044 "configure"
 #include "confdefs.h"
-#include <SDL/SDL_mixer.h>
+#include <SDL11/SDL_mixer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:5049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ab (-11 lines)
1	--- uta/color.h.orig Sat Mar 31 05:24:37 2001
2	+++ uta/color.h Sat Mar 31 05:26:10 2001
3	@@ -22,7 +22,7 @@
4	#define _COLOR_H
5
6	#include <iostream>
7	-#include <SDL/SDL_version.h>
8	+#include <SDL11/SDL_version.h>
9
10	namespace uta {
11	///

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ac (-11 lines)
1	--- uta/event.h.orig Sat Mar 31 05:24:44 2001
2	+++ uta/event.h Sat Mar 31 05:26:20 2001
3	@@ -21,7 +21,7 @@
4	#ifndef _EVENT_H
5	#define _EVENT_H
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include "keysym.h"
10	#include "point.h"
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ad (-11 lines)
1	--- uta/keysym.h.orig Sat Mar 31 05:24:56 2001
2	+++ uta/keysym.h Sat Mar 31 05:26:32 2001
3	@@ -20,7 +20,7 @@
4	#ifndef KEYSYM_H
5	#define KEYSYM_H
6
7	-#include <SDL/SDL_keysym.h>
8	+#include <SDL11/SDL_keysym.h>
9
10	namespace uta {
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ae (-11 lines)
1	--- uta/mutex.h.orig Sat Mar 31 05:25:05 2001
2	+++ uta/mutex.h Sat Mar 31 05:26:54 2001
3	@@ -22,7 +22,7 @@
4	#ifndef _MUTEX_H_
5	#define _MUTEX_H_
6
7	-#include <SDL/SDL_mutex.h>
8	+#include <SDL11/SDL_mutex.h>
9
10	namespace uta {
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-af (-11 lines)
1	--- uta/rect.h.orig Sat Mar 31 05:25:30 2001
2	+++ uta/rect.h Sat Mar 31 05:27:27 2001
3	@@ -21,7 +21,7 @@
4	#ifndef _RECT_H
5	#define _RECT_H
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9
10	#include "point.h"
11




--- uta/sound.h.orig	Sat Mar 31 05:25:38 2001
+++ uta/sound.h	Sat Mar 31 05:27:39 2001
@@ -36,9 +36,9 @@
 #endif
 
 #ifdef HAVE_MIXER
-#include <SDL/SDL_mixer.h>
+#include <SDL11/SDL_mixer.h>
 #else
-#include <SDL/SDL_types.h>
+#include <SDL11/SDL_types.h>
 #endif
 
 namespace uta {

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ah (-11 lines)
1	--- uta/surface.h.orig Sat Mar 31 05:25:49 2001
2	+++ uta/surface.h Sat Mar 31 05:27:49 2001
3	@@ -22,7 +22,7 @@
4	#ifndef _SURFACE_H_
5	#define _SURFACE_H_
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9
10	#include "color.h"
11	#include "point.h"

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ai (-11 lines)
1	--- uta/sge_blib.h.orig Sat Mar 31 05:44:18 2001
2	+++ uta/sge_blib.h Sat Mar 31 05:38:40 2001
3	@@ -18,7 +18,7 @@
4	#ifndef sge_blib_H
5	#define sge_blib_H
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include "sge_internal.h"
10
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-aj (-11 lines)
1	--- uta/sge_blib.cc.orig Sat Mar 31 05:40:36 2001
2	+++ uta/sge_blib.cc Sat Mar 31 05:40:51 2001
3	@@ -19,7 +19,7 @@
4	* This is written by Johan E. Thélin and is slightly modified by me.
5	*/
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include "sge_draw.h"
10	#include "sge_blib.h"
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ak (-11 lines)
1	--- uta/sge_draw.cc.orig Sat Mar 31 05:41:03 2001
2	+++ uta/sge_draw.cc Sat Mar 31 05:41:56 2001
3	@@ -20,7 +20,7 @@
4	* John Garrison's PowerPak
5	*/
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include <math.h>
10	#include <string.h>
11	#include <stdarg.h>

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-al (-11 lines)
1	--- uta/surface_io.cc.orig Sat Mar 31 05:41:28 2001
2	+++ uta/surface_io.cc Sat Mar 31 05:42:29 2001
3	@@ -79,7 +79,7 @@
4	#include <assert.h>
5
6	#include <png.h>
7	-#include <SDL/SDL_endian.h>
8	+#include <SDL11/SDL_endian.h>
9
10	namespace uta {
11

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-am (-11 lines)
1	--- uta/timer.cc.orig Sat Mar 31 05:41:43 2001
2	+++ uta/timer.cc Sat Mar 31 05:42:38 2001
3	@@ -18,7 +18,7 @@
4	Boston, MA 02111-1307, SA.
5	*/
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include "timer.h"
10
11	#include <stl.h>

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-an (-11 lines)
1	--- uta/pixelformat.h.orig Sat Mar 31 05:51:51 2001
2	+++ uta/pixelformat.h Sat Mar 31 05:52:22 2001
3	@@ -27,7 +27,7 @@
4
5
6	//just for typedefs ...
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9
10	#include <string>
11	#include <stl.h>

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-ao (-11 lines)
1	--- uta/sge_draw.h.orig Sat Mar 31 05:52:07 2001
2	+++ uta/sge_draw.h Sat Mar 31 05:52:34 2001
3	@@ -18,7 +18,7 @@
4	#ifndef sge_draw_H
5	#define sge_draw_H
6
7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>
9	#include "sge_internal.h"
10
11




--- acinclude.m4.orig	Tue Nov 21 11:10:07 2000
+++ acinclude.m4	Sat Mar 31 06:08:52 2001
@@ -606,8 +606,8 @@
 	CHECK_LIB_HEADER_VERSION(
 	    SDL,
 	    SDL_Init,
-	    SDL/SDL.h,
-	    SDL/SDL_version.h,
+	    SDL11/SDL.h,
+	    SDL11/SDL_version.h,
 	    SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL,
 	    $1,
 	http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz)
@@ -618,7 +618,7 @@
 [
     TEST_SKIP(
     [
-      AC_CHECK_HEADER(SDL/SDL_mixer.h,
+      AC_CHECK_HEADER(SDL11/SDL_mixer.h,
 	[
 		AC_DEFINE(HAVE_MIXER))
 		AC_CHECK_LIB([
@@ -1027,13 +1027,13 @@
   if test x$sdl_exec_prefix != x ; then
      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config
      fi
   fi
   if test x$sdl_prefix != x ; then
      sdl_args="$sdl_args --prefix=$sdl_prefix"
      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+        SDL_CONFIG=$sdl_prefix/bin/sdl11-config
      fi
   fi
 
@@ -1067,7 +1067,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 char*
 my_strdup (char *str)
@@ -1141,7 +1141,7 @@
           LIBS="$LIBS $SDL_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
@@ -1292,4 +1292,4 @@
   AC_SUBST(SIGC_CFLAGS)
   AC_SUBST(SIGC_LIBS)
  
-]) 
+]) 

Lines 1-11 Link Here

(-)/usr/ports/devel/libuta/files/patch-aq (-11 lines)
1	--- configure.in.orig Sat Mar 31 06:01:00 2001
2	+++ configure.in Sat Mar 31 06:01:12 2001
3	@@ -186,7 +186,7 @@
4	])
5	AM_CONDITIONAL(SMPEG_AVAILABLE, test x$have_smpeg = xyes)
6
7	-AC_CHECK_HEADER(SDL/SDL_mixer.h,AC_CHECK_LIB(SDL_mixer, Mix_SetPostMix, [
8	+AC_CHECK_HEADER(SDL11/SDL_mixer.h,AC_CHECK_LIB(SDL_mixer, Mix_SetPostMix, [
9	MIXLIBS=-lSDL_mixer
10	AC_DEFINE(HAVE_MIXER)
11	]))




--- aclocal.m4.orig	Wed Mar 21 13:44:06 2001
+++ aclocal.m4	Sat Mar 31 06:09:47 2001
@@ -618,8 +618,8 @@
 	CHECK_LIB_HEADER_VERSION(
 	    SDL,
 	    SDL_Init,
-	    SDL/SDL.h,
-	    SDL/SDL_version.h,
+	    SDL11/SDL.h,
+	    SDL11/SDL_version.h,
 	    SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL,
 	    $1,
 	http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz)
@@ -630,7 +630,7 @@
 [
     TEST_SKIP(
     [
-      AC_CHECK_HEADER(SDL/SDL_mixer.h,
+      AC_CHECK_HEADER(SDL11/SDL_mixer.h,
 	[
 		AC_DEFINE(HAVE_MIXER))
 		AC_CHECK_LIB([
@@ -1039,13 +1039,13 @@
   if test x$sdl_exec_prefix != x ; then
      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config
      fi
   fi
   if test x$sdl_prefix != x ; then
      sdl_args="$sdl_args --prefix=$sdl_prefix"
      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+        SDL_CONFIG=$sdl_prefix/bin/sdl11-config
      fi
   fi
 
@@ -1079,7 +1079,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 char*
 my_strdup (char *str)
@@ -1153,7 +1153,7 @@
           LIBS="$LIBS $SDL_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"

Lines 1-6 Link Here

(-)/usr/ports/devel/libuta/pkg-plist (-1 / +3 lines)
1	bin/uta-config	1	bin/uta-config
		2	lib/libuta.la
2	lib/libuta.so	3	lib/libuta.so
3	lib/libuta-0.3.so.38	4	lib/libuta-0.4.so
		5	lib/libuta-0.4.so.0
4	lib/libuta.a	6	lib/libuta.a
5	include/uta/debug.h	7	include/uta/debug.h
6	include/uta/color.h	8	include/uta/color.h

Return to bug 40083

Lines 6-26 Link Here

(-)/usr/ports/devel/libuta/Makefile (-7 / +37 lines)
6	#	6	#
7		7
8	PORTNAME= libuta	8	PORTNAME= libuta
9	PORTVERSION= 0.3.38	9	PORTVERSION= 0.4.1
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13		13
14	MAINTAINER= lehmann@ans-netz.de	14	MAINTAINER= lehmann@ans-netz.de
15		15
16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
17	sigc.1:${PORTSDIR}/devel/libsigc++ \	17	sigc.1:${PORTSDIR}/devel/libsigc++ \
18	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \	18	SDL-1.1.4:${PORTSDIR}/devel/sdl12
19	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
20		19
21	USE_FREETYPE= yes	20	USE_FREETYPE= yes
22	USE_LIBTOOL= yes	21	USE_LIBTOOL= yes
23	CONFIGURE_ARGS= --prefix=${PREFIX}	22	GNU_CONFIGURE= yes
24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1"	23	USE_REINPLACE= yes
25		24
26	.include <bsd.port.mk>	25	CONFIGURE_ENV= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \
		26	LIBS="-L${LOCALBASE}/lib"
		27
		28	SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
		29	uta/pixelformat.h uta/rect.h uta/sge_blib.cc uta/sge_blib.h \
		30	uta/sge_draw.cc uta/sge_draw.h uta/sound.h uta/surface_io.cc \
		31	uta/surface.h uta/timer.cc
		32
		33	.include <bsd.port.pre.mk>
		34
		35	.if exists(${LOCALBASE}/lib/libSDL_mixer.so.2)
		36	WITH_SDL_MIXER= yes
		37	.endif
		38
		39	.if defined(WITH_SDL_MIXER)
		40	LIB_DEPENDS+= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
		41	.endif
		42
		43
		44	pre-everything::
		45	@${ECHO} ""
		46	@${ECHO} "You may use the following build options:"
		47	@${ECHO} ""
		48	@${ECHO} " WITH_SDL_MIXER=yes Enable music and sound support"
		49	@${ECHO} ""
		50
		51	post-patch:
		52	.for i in ${SDL11_FILES}
		53	${REINPLACE_CMD} -e 's\|SDL/\|SDL11/\|' ${WRKSRC}/$i
		54	.endfor
		55
		56	.include <bsd.port.post.mk>

Lines 1-60 Link Here

(-)/usr/ports/devel/libuta/files/patch-aa (-60 lines)
1
2	$FreeBSD: ports/devel/libuta/files/patch-aa,v 1.4 2002/03/14 11:16:38 sobomax Exp $
3
4	--- configure.orig Thu Apr 12 12:21:35 2001
5	+++ configure Thu Mar 14 13:09:31 2002
6	@@ -7,6 +7,9 @@
7	# This configure script is free software; the Free Software Foundation
8	# gives unlimited permission to copy, distribute and modify it.
9
10	+LIBS="$LIBS -L/usr/local/lib"
11	+SDL_CONFIG="/usr/local/bin/sdl11-config"
12	+
13	# Defaults:
14	ac_help=
15	ac_default_prefix=/usr/local
16	@@ -3573,7 +3576,7 @@
17
18	CFLAGS=
19	CXXFLAGS=
20	-CPPFLAGS=-Wall
21	+CPPFLAGS="$CPPFLAGS -Wall"
22
23	case $win32 in
24	true)
25	@@ -4603,7 +4606,7 @@
26	no_sdl=yes
27	else
28	SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
29	- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
30	+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs \| sed 's/-lXxf86vm -lXxf86dga -lXv //g'`
31
32	sdl_major_version=`$SDL_CONFIG $sdl_args --version \| \
33	sed 's/\([0-9]\).\([0-9]\).\([0-9]*\)/\1/'`
34	@@ -4627,7 +4630,7 @@
35	#include <stdio.h>
36	#include <stdlib.h>
37	#include <string.h>
38	-#include <SDL/SDL.h>
39	+#include <SDL11/SDL.h>
40
41	char*
42	my_strdup (char *str)
43	@@ -4717,7 +4720,7 @@
44	#include "confdefs.h"
45
46	#include <stdio.h>
47	-#include <SDL/SDL.h>
48	+#include <SDL11/SDL.h>
49
50	int main() {
51	return 0;
52	@@ -5042,7 +5045,7 @@
53	cat > conftest.$ac_ext <<EOF
54	#line 5044 "configure"
55	#include "confdefs.h"
56	-#include <SDL/SDL_mixer.h>
57	+#include <SDL11/SDL_mixer.h>
58	EOF
59	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
60	{ (eval echo configure:5049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

Lines 1-14 Link Here

(-)/usr/ports/devel/libuta/files/patch-ag (-14 lines)
1	--- uta/sound.h.orig Sat Mar 31 05:25:38 2001
2	+++ uta/sound.h Sat Mar 31 05:27:39 2001
3	@@ -36,9 +36,9 @@
4	#endif
5
6	#ifdef HAVE_MIXER
7	-#include <SDL/SDL_mixer.h>
8	+#include <SDL11/SDL_mixer.h>
9	#else
10	-#include <SDL/SDL_types.h>
11	+#include <SDL11/SDL_types.h>
12	#endif
13
14	namespace uta {

Lines 1-62 Link Here

(-)/usr/ports/devel/libuta/files/patch-ap (-62 lines)
1	--- acinclude.m4.orig Tue Nov 21 11:10:07 2000
2	+++ acinclude.m4 Sat Mar 31 06:08:52 2001
3	@@ -606,8 +606,8 @@
4	CHECK_LIB_HEADER_VERSION(
5	SDL,
6	SDL_Init,
7	- SDL/SDL.h,
8	- SDL/SDL_version.h,
9	+ SDL11/SDL.h,
10	+ SDL11/SDL_version.h,
11	SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL,
12	$1,
13	http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz)
14	@@ -618,7 +618,7 @@
15	[
16	TEST_SKIP(
17	[
18	- AC_CHECK_HEADER(SDL/SDL_mixer.h,
19	+ AC_CHECK_HEADER(SDL11/SDL_mixer.h,
20	[
21	AC_DEFINE(HAVE_MIXER))
22	AC_CHECK_LIB([
23	@@ -1027,13 +1027,13 @@
24	if test x$sdl_exec_prefix != x ; then
25	sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
26	if test x${SDL_CONFIG+set} != xset ; then
27	- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
28	+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config
29	fi
30	fi
31	if test x$sdl_prefix != x ; then
32	sdl_args="$sdl_args --prefix=$sdl_prefix"
33	if test x${SDL_CONFIG+set} != xset ; then
34	- SDL_CONFIG=$sdl_prefix/bin/sdl-config
35	+ SDL_CONFIG=$sdl_prefix/bin/sdl11-config
36	fi
37	fi
38
39	@@ -1067,7 +1067,7 @@
40	#include <stdio.h>
41	#include <stdlib.h>
42	#include <string.h>
43	-#include <SDL/SDL.h>
44	+#include <SDL11/SDL.h>
45
46	char*
47	my_strdup (char *str)
48	@@ -1141,7 +1141,7 @@
49	LIBS="$LIBS $SDL_LIBS"
50	AC_TRY_LINK([
51	#include <stdio.h>
52	-#include <SDL/SDL.h>
53	+#include <SDL11/SDL.h>
54	], [ return 0; ],
55	[ echo "*** The test program compiled, but did not run. This usually means"
56	echo "*** that the run-time linker is not finding SDL or finding the wrong"
57	@@ -1292,4 +1292,4 @@
58	AC_SUBST(SIGC_CFLAGS)
59	AC_SUBST(SIGC_LIBS)
60
61	-])
62	+])

Lines 1-56 Link Here

(-)/usr/ports/devel/libuta/files/patch-ar (-56 lines)
1	--- aclocal.m4.orig Wed Mar 21 13:44:06 2001
2	+++ aclocal.m4 Sat Mar 31 06:09:47 2001
3	@@ -618,8 +618,8 @@
4	CHECK_LIB_HEADER_VERSION(
5	SDL,
6	SDL_Init,
7	- SDL/SDL.h,
8	- SDL/SDL_version.h,
9	+ SDL11/SDL.h,
10	+ SDL11/SDL_version.h,
11	SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL,
12	$1,
13	http://www.devolution.com/~slouken/SDL/SDL-0.10/src/SDL-$1.tar.gz)
14	@@ -630,7 +630,7 @@
15	[
16	TEST_SKIP(
17	[
18	- AC_CHECK_HEADER(SDL/SDL_mixer.h,
19	+ AC_CHECK_HEADER(SDL11/SDL_mixer.h,
20	[
21	AC_DEFINE(HAVE_MIXER))
22	AC_CHECK_LIB([
23	@@ -1039,13 +1039,13 @@
24	if test x$sdl_exec_prefix != x ; then
25	sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
26	if test x${SDL_CONFIG+set} != xset ; then
27	- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
28	+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl11-config
29	fi
30	fi
31	if test x$sdl_prefix != x ; then
32	sdl_args="$sdl_args --prefix=$sdl_prefix"
33	if test x${SDL_CONFIG+set} != xset ; then
34	- SDL_CONFIG=$sdl_prefix/bin/sdl-config
35	+ SDL_CONFIG=$sdl_prefix/bin/sdl11-config
36	fi
37	fi
38
39	@@ -1079,7 +1079,7 @@
40	#include <stdio.h>
41	#include <stdlib.h>
42	#include <string.h>
43	-#include <SDL/SDL.h>
44	+#include <SDL11/SDL.h>
45
46	char*
47	my_strdup (char *str)
48	@@ -1153,7 +1153,7 @@
49	LIBS="$LIBS $SDL_LIBS"
50	AC_TRY_LINK([
51	#include <stdio.h>
52	-#include <SDL/SDL.h>
53	+#include <SDL11/SDL.h>
54	], [ return 0; ],
55	[ echo "*** The test program compiled, but did not run. This usually means"
56	echo "*** that the run-time linker is not finding SDL or finding the wrong"