diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
| commit | 0d2725682b8325a08b11592d11062997bb9dc7f2 (patch) | |
| tree | 46ab0c86563bfc2fbab1ecc5f9dadffb47afe737 /devel/adasdl | |
| parent | 750f1f56ed3264341b911b1182fc2f3f4dd609c2 (diff) | |
| download | ports-0d2725682b8325a08b11592d11062997bb9dc7f2.tar.gz ports-0d2725682b8325a08b11592d11062997bb9dc7f2.zip | |
- Update devel/sdl12 to version 1.2.11. Now we employ stock SDL directory
structure (i.e. include/SDL for includes and sdl-config for configuration
binary)
- Update graphics/sdl_ttf to version 2.0.8
- Update graphics/sdl_image to version 1.2.5
- Update audio/sdl_mixer to version 1.2.7
- Update net/sdl_net to version 1.2.6
- Update Mk/bsd.sdl.mk accordingly
- Fix dependent ports to fit the new directory structure and avoid several
API breakages
- Bump up portrevisions for all dependent ports to allow them to be upgraded
by portupgrade/portmaster etc tools
Approved by: kris (portmgr), sem (mentor)
Notes
Notes:
svn path=/head/; revision=173460
Diffstat (limited to 'devel/adasdl')
| -rw-r--r-- | devel/adasdl/Makefile | 3 | ||||
| -rw-r--r-- | devel/adasdl/files/patch-AdaSDL-make.conf_x11 | 2 | ||||
| -rw-r--r-- | devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 | 2 | ||||
| -rw-r--r-- | devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile | 2 | ||||
| -rw-r--r-- | devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 | 2 | ||||
| -rw-r--r-- | devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile index b407e377c03c..618c8aeb9cbc 100644 --- a/devel/adasdl/Makefile +++ b/devel/adasdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= adasdl PORTVERSION= 20010504 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -30,7 +30,6 @@ do-patch: ${REINPLACE_CMD} \ -e 's,/usr/local,${LOCALBASE},g' \ -e 's,/usr/X11R6,${X11BASE},g' \ - -e 's,-lSDL\ ,-lSDL-1.1\ ,' \ -e 's,-lpthread,-pthread,' \ -e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \ $${i}; \ diff --git a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 index a0168a08878d..740144d50f13 100644 --- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU GNATHTML=/usr/local/bin/gnathtml.pl PERL=/usr/bin/perl EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 index c6d993d6c330..f8fb309baef8 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile index c2bbf0a1cd8d..b0b4612b24ce 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile @@ -4,7 +4,7 @@ -INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I.. -include ../make.conf -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU + +INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I.. diff --git a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 index 1ad184efd798..ba7104bfd4f0 100644 --- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_image -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 index 98ed13bc9468..c344fbf0ac34 100644 --- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= |