diff options
-rw-r--r-- | devel/sdl-devel/Makefile | 54 | ||||
-rw-r--r-- | devel/sdl-devel/files/patch-ac | 19 | ||||
-rw-r--r-- | devel/sdl-devel/pkg-plist | 1 | ||||
-rw-r--r-- | devel/sdl12/Makefile | 54 | ||||
-rw-r--r-- | devel/sdl12/files/patch-ac | 19 | ||||
-rw-r--r-- | devel/sdl12/pkg-plist | 1 |
6 files changed, 94 insertions, 54 deletions
diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile index b50d7fe96f9..85076583255 100644 --- a/devel/sdl-devel/Makefile +++ b/devel/sdl-devel/Makefile @@ -5,51 +5,55 @@ # $FreeBSD$ # -PORTNAME= sdl-devel -PORTVERSION= 1.1.4 -CATEGORIES= devel -MASTER_SITES= http://www.libsdl.org/release/ \ - http://www.devolution.com/~slouken/SDL/release/ -DISTNAME= SDL-${PORTVERSION} +PORTNAME= sdl-devel +PORTVERSION= 1.1.4 +CATEGORIES= devel +MASTER_SITES= http://www.libsdl.org/release/ \ + http://www.devolution.com/~slouken/SDL/release/ +DISTNAME= SDL-${PORTVERSION} -MAINTAINER= sobomax@FreeBSD.org +MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - aa.1:${PORTSDIR}/graphics/aalib -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ + aa.1:${PORTSDIR}/graphics/aalib \ + vga.1:${PORTSDIR}/graphics/svgalib +BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -USE_GMAKE= yes -USE_XLIB= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_XLIB= yes +INSTALLS_SHLIB= yes +USE_LIBTOOL= yes -CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ - LOCALBASE="${LOCALBASE}" -CONFIGURE_ARGS= --enable-video-aalib +CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ + LOCALBASE="${LOCALBASE}" +CONFIGURE_ARGS= --enable-video-aalib \ + --enable-video-svga -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= -D_THREAD_SAFE .if defined(WITHOUT_GL) CONFIGURE_ARGS+= --disable-video-opengl .else -USE_MESA= yes +USE_MESA= yes CONFIGURE_ARGS+= --enable-video-opengl .endif post-configure: - @ cd ${WRKSRC} && \ + @cd ${WRKSRC} && \ ${CP} sdl-config sdl11-config && \ ${CP} sdl.m4 sdl11.m4 + @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ + ${WRKSRC}/libtool post-install: - @ ${MKDIR} ${PREFIX}/share/examples/SDL11 - @ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11 + @${MKDIR} ${PREFIX}/share/examples/SDL11 + @${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11 .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/SDL11 + @${MKDIR} ${PREFIX}/share/doc/SDL11 .for file in BUGS COPYING CREDITS README WhatsNew docs.html - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11 + @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11 .endfor - @ cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \ + @cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \ (cd ${PREFIX}/share/doc/SDL11; ${TAR} --unlink -xf - ) .endif diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac index 46e9710143b..93bba165c6a 100644 --- a/devel/sdl-devel/files/patch-ac +++ b/devel/sdl-devel/files/patch-ac @@ -1,5 +1,5 @@ --- configure.orig Fri Aug 4 22:23:00 2000 -+++ configure Mon Aug 7 15:44:03 2000 ++++ configure Fri Aug 25 06:50:42 2000 @@ -603,7 +603,7 @@ SDL_MAJOR_VERSION=1 SDL_MINOR_VERSION=1 @@ -30,3 +30,20 @@ # Check whether --enable-audio or --disable-audio was given. +@@ -4448,8 +4448,6 @@ + #include <vga.h> + #include <vgamouse.h> + #include <vgakeyboard.h> +- #include <linux/kd.h> +- #include <linux/keyboard.h> + + int main() { + +@@ -5166,6 +5164,7 @@ + CheckESD + CheckX11 + CheckAAlib ++ CheckSVGA + CheckOpenGL + CheckPTHREAD + # Set up files for the main() stub diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist index eafe56b1e3f..c11cc636450 100644 --- a/devel/sdl-devel/pkg-plist +++ b/devel/sdl-devel/pkg-plist @@ -26,7 +26,6 @@ include/SDL11/begin_code.h include/SDL11/close_code.h lib/libSDL-1.1.so.2 lib/libSDL-1.1.a -lib/libSDL-1.1.la lib/libSDL-1.1.so lib/libSDLmain-1.1.a share/aclocal/sdl11.m4 diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index b50d7fe96f9..85076583255 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -5,51 +5,55 @@ # $FreeBSD$ # -PORTNAME= sdl-devel -PORTVERSION= 1.1.4 -CATEGORIES= devel -MASTER_SITES= http://www.libsdl.org/release/ \ - http://www.devolution.com/~slouken/SDL/release/ -DISTNAME= SDL-${PORTVERSION} +PORTNAME= sdl-devel +PORTVERSION= 1.1.4 +CATEGORIES= devel +MASTER_SITES= http://www.libsdl.org/release/ \ + http://www.devolution.com/~slouken/SDL/release/ +DISTNAME= SDL-${PORTVERSION} -MAINTAINER= sobomax@FreeBSD.org +MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - aa.1:${PORTSDIR}/graphics/aalib -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ + aa.1:${PORTSDIR}/graphics/aalib \ + vga.1:${PORTSDIR}/graphics/svgalib +BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -USE_GMAKE= yes -USE_XLIB= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_XLIB= yes +INSTALLS_SHLIB= yes +USE_LIBTOOL= yes -CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ - LOCALBASE="${LOCALBASE}" -CONFIGURE_ARGS= --enable-video-aalib +CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ + LOCALBASE="${LOCALBASE}" +CONFIGURE_ARGS= --enable-video-aalib \ + --enable-video-svga -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= -D_THREAD_SAFE .if defined(WITHOUT_GL) CONFIGURE_ARGS+= --disable-video-opengl .else -USE_MESA= yes +USE_MESA= yes CONFIGURE_ARGS+= --enable-video-opengl .endif post-configure: - @ cd ${WRKSRC} && \ + @cd ${WRKSRC} && \ ${CP} sdl-config sdl11-config && \ ${CP} sdl.m4 sdl11.m4 + @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ + ${WRKSRC}/libtool post-install: - @ ${MKDIR} ${PREFIX}/share/examples/SDL11 - @ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11 + @${MKDIR} ${PREFIX}/share/examples/SDL11 + @${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11 .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/SDL11 + @${MKDIR} ${PREFIX}/share/doc/SDL11 .for file in BUGS COPYING CREDITS README WhatsNew docs.html - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11 + @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11 .endfor - @ cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \ + @cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \ (cd ${PREFIX}/share/doc/SDL11; ${TAR} --unlink -xf - ) .endif diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac index 46e9710143b..93bba165c6a 100644 --- a/devel/sdl12/files/patch-ac +++ b/devel/sdl12/files/patch-ac @@ -1,5 +1,5 @@ --- configure.orig Fri Aug 4 22:23:00 2000 -+++ configure Mon Aug 7 15:44:03 2000 ++++ configure Fri Aug 25 06:50:42 2000 @@ -603,7 +603,7 @@ SDL_MAJOR_VERSION=1 SDL_MINOR_VERSION=1 @@ -30,3 +30,20 @@ # Check whether --enable-audio or --disable-audio was given. +@@ -4448,8 +4448,6 @@ + #include <vga.h> + #include <vgamouse.h> + #include <vgakeyboard.h> +- #include <linux/kd.h> +- #include <linux/keyboard.h> + + int main() { + +@@ -5166,6 +5164,7 @@ + CheckESD + CheckX11 + CheckAAlib ++ CheckSVGA + CheckOpenGL + CheckPTHREAD + # Set up files for the main() stub diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist index eafe56b1e3f..c11cc636450 100644 --- a/devel/sdl12/pkg-plist +++ b/devel/sdl12/pkg-plist @@ -26,7 +26,6 @@ include/SDL11/begin_code.h include/SDL11/close_code.h lib/libSDL-1.1.so.2 lib/libSDL-1.1.a -lib/libSDL-1.1.la lib/libSDL-1.1.so lib/libSDLmain-1.1.a share/aclocal/sdl11.m4 |