From owner-freebsd-ports Wed Feb 9 6:30:41 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by builder.freebsd.org (Postfix) with ESMTP id 53B893E69 for ; Wed, 9 Feb 2000 06:30:29 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id GAA04116; Wed, 9 Feb 2000 06:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from ipt2.iptelecom.net.ua (ipt2.iptelecom.net.ua [212.9.224.2]) by builder.freebsd.org (Postfix) with ESMTP id 072C23D7D for ; Wed, 9 Feb 2000 06:21:50 -0800 (PST) Received: from vega.vega.com (dialup5-9.iptelecom.net.ua [212.9.227.9]) by ipt2.iptelecom.net.ua (8.9.3/8.9.3) with ESMTP id QAA13311 for ; Wed, 9 Feb 2000 16:23:40 +0200 (EET) Received: (from max@localhost) by vega.vega.com (8.9.3/8.9.3) id QAA40102; Wed, 9 Feb 2000 16:20:47 +0200 (EET) (envelope-from sobomax@altavista.net) Message-Id: <200002091420.QAA40102@vega.vega.com> Date: Wed, 9 Feb 2000 16:20:47 +0200 (EET) From: sobomax@altavista.net Reply-To: sobomax@altavista.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/16607: [PATCH] update of the SDL port to the 1.0.4 version Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16607 >Category: ports >Synopsis: [PATCH] update of the SDL port to the 1.0.4 version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 9 06:30:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: Maxim Sobolev >Release: FreeBSD 3.4-STABLE i386 >Organization: Vega International Capital >Environment: >Description: Update of the SDL port to the 1.0.4 version >How-To-Repeat: >Fix: diff -ruN /usr/ports/devel/sdl/Makefile sdl/Makefile --- /usr/ports/devel/sdl/Makefile Thu Feb 3 11:29:36 2000 +++ sdl/Makefile Wed Feb 9 16:15:57 2000 @@ -1,13 +1,13 @@ # New ports collection makefile for: SDL -# Version required: 1.0.3 +# Version required: 1.0.4 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD: ports/devel/sdl/Makefile,v 1.5 2000/02/03 08:19:17 cpiazza Exp $ # -DISTNAME= SDL-1.0.3 -PKGNAME= sdl-1.0.3 +DISTNAME= SDL-1.0.4 +PKGNAME= sdl-1.0.4 CATEGORIES= devel MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ diff -ruN /usr/ports/devel/sdl/files/md5 sdl/files/md5 --- /usr/ports/devel/sdl/files/md5 Thu Feb 3 09:21:33 2000 +++ sdl/files/md5 Tue Feb 8 11:05:00 2000 @@ -1 +1 @@ -MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe +MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b diff -ruN /usr/ports/devel/sdl/patches/patch-ac sdl/patches/patch-ac --- /usr/ports/devel/sdl/patches/patch-ac Thu Feb 3 11:29:43 2000 +++ sdl/patches/patch-ac Tue Feb 8 11:31:37 2000 @@ -1,6 +1,6 @@ ---- configure.orig Tue Dec 14 01:33:42 1999 -+++ configure Sat Jan 8 23:23:37 2000 -@@ -3030,7 +3030,7 @@ +--- configure.orig Tue Feb 8 03:53:58 2000 ++++ configure Tue Feb 8 11:31:03 2000 +@@ -3016,7 +3016,7 @@ echo "$ac_t""yes" 1>&6 CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" @@ -9,21 +9,16 @@ else echo "$ac_t""no" 1>&6 -@@ -4333,11 +4333,11 @@ - +@@ -4326,7 +4326,7 @@ ac_save_libs="$LIBS" case "$target" in -- *-*-freebsd*) -+ *-*-frebsd*) - pthread_lib="-lc_r" - ;; - *) -- pthread_lib="-lpthread" + *-*-freebsd*) +- pthread_lib="-lc_r" + pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; - esac - LIBS="$LIBS $pthread_lib" -@@ -4371,7 +4371,7 @@ + *-*-openbsd*) + pthread_lib="-lc_r" +@@ -4366,7 +4366,7 @@ echo "$ac_t""$use_pthreads" 1>&6 if test x$use_pthreads = xyes; then CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS" @@ -32,7 +27,7 @@ SDL_LIBS="$SDL_LIBS $pthread_lib" fi fi -@@ -4851,6 +4851,7 @@ +@@ -4955,6 +4955,7 @@ ;; *-*-freebsd*) ARCH=freebsd @@ -40,3 +35,32 @@ CheckESD CheckX11 CheckPTHREAD +@@ -5038,6 +5039,28 @@ + __EOF__ + cat >>$new <$old + ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.h" ++ new="$srcdir/src/audio/SDL_dspaudio.h" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.c" ++ new="$srcdir/src/audio/SDL_dspaudio.c" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then diff -ruN /usr/ports/devel/sdl/pkg/PLIST sdl/pkg/PLIST --- /usr/ports/devel/sdl/pkg/PLIST Thu Feb 3 11:29:43 2000 +++ sdl/pkg/PLIST Tue Feb 8 11:43:00 2000 @@ -32,6 +32,9 @@ @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/aclocal/sdl.m4 +share/doc/SDL/.codeblock +share/doc/SDL/.header +share/doc/SDL/.macros share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message