From esolson@olsonexpress.com  Fri Apr  4 17:47:06 2003
Return-Path: <esolson@olsonexpress.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0552037B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Apr 2003 17:47:06 -0800 (PST)
Received: from jupiter.olsonexpress.com (h98.240.213.151.ip.alltel.net [151.213.240.98])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A0A3643FCB
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Apr 2003 17:47:04 -0800 (PST)
	(envelope-from esolson@olsonexpress.com)
Received: from jupiter.olsonexpress.com (localhost.olsonexpress.com [127.0.0.1])
	by jupiter.olsonexpress.com (8.12.8/8.12.8) with ESMTP id h351nBbE005487;
	Fri, 4 Apr 2003 20:49:11 -0500 (EST)
	(envelope-from esolson@olsonexpress.com)
Received: (from esolson@localhost)
	by jupiter.olsonexpress.com (8.12.8/8.12.8/Submit) id h351nA4Y005486;
	Fri, 4 Apr 2003 20:49:10 -0500 (EST)
	(envelope-from esolson)
Message-Id: <200304050149.h351nA4Y005486@jupiter.olsonexpress.com>
Date: Fri, 4 Apr 2003 20:49:10 -0500 (EST)
From: Erik Olson <esolson@olsonexpress.com>
Reply-To: Erik Olson <esolson@olsonexpress.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: erikolson@olsonexpress.com
Subject: UPDATE-PORT:  devel/linux-sdl12 update to 1.2.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50616
>Category:       ports
>Synopsis:       UPDATE-PORT:  devel/linux-sdl12 update to 1.2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 04 17:50:00 PST 2003
>Closed-Date:    Fri Oct 03 23:57:52 PDT 2003
>Last-Modified:  Fri Oct 03 23:57:52 PDT 2003
>Originator:     Erik Olson
>Release:        FreeBSD 4.8-RC i386
>Organization:
none
>Environment:
System: FreeBSD jupiter.olsonexpress.com 4.8-RC FreeBSD 4.8-RC #2: Sat Mar 29 03:25:23 EST 2003 root@jupiter.olsonexpress.com:/usr/src/sys/compile/JUPITER i386

>Description:
I am working on a couple of new ports that I hope to submit shortly.  
One of these required an updated copy of the Linux SDL library.
I contacted the port maintainer listed on FreeBSD.org, but he no longer maintains this port:
---
Hash: SHA1

Hello,

if you look at the current ports tree I don't maintain the port anymore.
Therefore sending any code to me won't help.
The best for you is submitting a PR and requesting maintainership for
the port.

Thank you,
Martin Matuska
----
Therefore, I updated it myself.  My machine is Intel based, so I was able to test that version out.  For the alpha based version, I downloaded the code, created the MD5 listing and tested it out as best I could.  I have included two different files, one diff between the old and my versions, and a shar of the completed new version.

I am willing to take maintainership of this port, as Martin Matuska recommend.

Thank your for the help.

Erik Olson

>How-To-Repeat:
n.a.
>Fix:
Attached is the updated diff and shar files.

--- linux-sdl12.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	linux-sdl12
#	linux-sdl12/pkg-plist.alpha
#	linux-sdl12/Makefile
#	linux-sdl12/distinfo.alpha
#	linux-sdl12/distinfo.i386
#	linux-sdl12/pkg-descr
#	linux-sdl12/pkg-plist.i386
#
echo c - linux-sdl12
mkdir -p linux-sdl12 > /dev/null 2>&1
echo x - linux-sdl12/pkg-plist.alpha
sed 's/^X//' >linux-sdl12/pkg-plist.alpha << 'END-of-linux-sdl12/pkg-plist.alpha'
Xusr/doc/SDL-1.2.5/BUGS
Xusr/doc/SDL-1.2.5/COPYING
Xusr/doc/SDL-1.2.5/CREDITS
Xusr/doc/SDL-1.2.5/README-SDL.txt
Xusr/lib/libSDL-1.1.so.0
Xusr/lib/libSDL-1.2.so.0
Xusr/lib/libSDL-1.2.so.0.0.5
X@dirrm usr/doc/SDL-1.2.5
END-of-linux-sdl12/pkg-plist.alpha
echo x - linux-sdl12/Makefile
sed 's/^X//' >linux-sdl12/Makefile << 'END-of-linux-sdl12/Makefile'
X# New ports collection makefile for:	linux-sdl
X# Date created:				8 October 2001
X# Whom:                         Martin Matuska <martin@tradex.sk>
X# Based on:		emulators/linux_base by marcel@FreeBSD.org
X#
X# $FreeBSD: ports/devel/linux-sdl12/Makefile,v 1.5 2003/03/25 01:39:55 pat Exp $
X#
X
XPORTNAME=	sdl
XPORTVERSION=	1.2.5
XCATEGORIES=	devel linux
XMASTER_SITES=	http://www.libsdl.org/release/ \
X		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
XPKGNAMEPREFIX=	linux-
XDISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
XEXTRACT_SUFX=	.rpm
XEXTRACT_ONLY=
X
XMAINTAINER=	ports@FreeBSD.org
XCOMMENT=	Cross-platform multi-media development API (linux version)
X
XBUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
X
XUSE_LINUX_PREFIX=	yes
XLDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
X
XONLY_FOR_ARCHS=	i386 alpha
XDIST_SUBDIR=	rpm
XNO_BUILD=	yes
XNO_FILTER_SHLIBS=	yes
XPLIST=		${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
XMD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
X
XDBPATH=		/var/lib/rpm
XRPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
X		--nodeps --replacepkgs
XRPMDIR=		${DISTDIR}/${DIST_SUBDIR}
X
Xdo-install:
X	@${LOCALBASE}/bin/rpm -U ${RPMFLAGS} ${RPMDIR}/${DISTFILES}
X	@${LDCONFIG_LINUX}
X
X.include <bsd.port.mk>
END-of-linux-sdl12/Makefile
echo x - linux-sdl12/distinfo.alpha
sed 's/^X//' >linux-sdl12/distinfo.alpha << 'END-of-linux-sdl12/distinfo.alpha'
XMD5 (rpm/SDL-1.2.5-1.alpha.rpm) = 32449f9682e0b34c09421859d21b5fce
END-of-linux-sdl12/distinfo.alpha
echo x - linux-sdl12/distinfo.i386
sed 's/^X//' >linux-sdl12/distinfo.i386 << 'END-of-linux-sdl12/distinfo.i386'
XMD5 (rpm/SDL-1.2.5-1.i386.rpm) = 60fc1cc75098167f5d836b0af1ba25c8
END-of-linux-sdl12/distinfo.i386
echo x - linux-sdl12/pkg-descr
sed 's/^X//' >linux-sdl12/pkg-descr << 'END-of-linux-sdl12/pkg-descr'
XUnstable development version of the SDL library (linux version).
X
XThis library is designed to make it easy to write games that run
Xon UNIX, Win32 and BeOS using the various native high-performance
Xmedia interfaces, (for video, audio, etc) and presenting a single
Xsource-code level API to your application. This is a fairly low
Xlevel API, but using this, completely portable applications can be
Xwritten with a great deal of flexibility.
X
XWWW: http://www.libsdl.org/
END-of-linux-sdl12/pkg-descr
echo x - linux-sdl12/pkg-plist.i386
sed 's/^X//' >linux-sdl12/pkg-plist.i386 << 'END-of-linux-sdl12/pkg-plist.i386'
Xusr/doc/SDL-1.2.5/BUGS
Xusr/doc/SDL-1.2.5/COPYING
Xusr/doc/SDL-1.2.5/CREDITS
Xusr/doc/SDL-1.2.5/README-SDL.txt
Xusr/lib/libSDL-1.1.so.0
Xusr/lib/libSDL-1.2.so.0
Xusr/lib/libSDL-1.2.so.0.0.5
X@dirrm usr/doc/SDL-1.2.5
END-of-linux-sdl12/pkg-plist.i386
exit
--- linux-sdl12.shar ends here ---

--- linux-sdl12.diff begins here ---
diff -ruN linux-sdl12.bak/Makefile linux-sdl12/Makefile
--- linux-sdl12.bak/Makefile	Mon Mar 24 20:39:55 2003
+++ linux-sdl12/Makefile	Fri Apr  4 20:18:43 2003
@@ -7,11 +7,12 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.2.1
+PORTVERSION=	1.2.5
 CATEGORIES=	devel linux
-MASTER_SITES=	http://www.libsdl.org/release/
+MASTER_SITES=	http://www.libsdl.org/release/ \
+		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}.${MACHINE_ARCH}
+DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
diff -ruN linux-sdl12.bak/distinfo.alpha linux-sdl12/distinfo.alpha
--- linux-sdl12.bak/distinfo.alpha	Tue Oct 16 22:12:55 2001
+++ linux-sdl12/distinfo.alpha	Fri Apr  4 20:26:15 2003
@@ -1 +1 @@
-MD5 (rpm/SDL-1.2.2-1.alpha.rpm) = 35a5dce5bd3a82ae47288282350cb187
+MD5 (rpm/SDL-1.2.5-1.alpha.rpm) = 32449f9682e0b34c09421859d21b5fce
diff -ruN linux-sdl12.bak/distinfo.i386 linux-sdl12/distinfo.i386
--- linux-sdl12.bak/distinfo.i386	Tue Oct 16 22:12:55 2001
+++ linux-sdl12/distinfo.i386	Wed Apr  2 22:42:21 2003
@@ -1 +1 @@
-MD5 (rpm/SDL-1.2.2-1.i386.rpm) = 373dc3cf57ddfa1f90bf99b16b57c7c6
+MD5 (rpm/SDL-1.2.5-1.i386.rpm) = 60fc1cc75098167f5d836b0af1ba25c8
diff -ruN linux-sdl12.bak/pkg-plist.alpha linux-sdl12/pkg-plist.alpha
--- linux-sdl12.bak/pkg-plist.alpha	Tue Oct 16 22:12:55 2001
+++ linux-sdl12/pkg-plist.alpha	Fri Apr  4 19:55:33 2003
@@ -1,8 +1,8 @@
-usr/doc/SDL-1.2.2/BUGS
-usr/doc/SDL-1.2.2/COPYING
-usr/doc/SDL-1.2.2/CREDITS
-usr/doc/SDL-1.2.2/README-SDL.txt
+usr/doc/SDL-1.2.5/BUGS
+usr/doc/SDL-1.2.5/COPYING
+usr/doc/SDL-1.2.5/CREDITS
+usr/doc/SDL-1.2.5/README-SDL.txt
 usr/lib/libSDL-1.1.so.0
 usr/lib/libSDL-1.2.so.0
-usr/lib/libSDL-1.2.so.0.0.2
-@dirrm usr/doc/SDL-1.2.2
+usr/lib/libSDL-1.2.so.0.0.5
+@dirrm usr/doc/SDL-1.2.5
diff -ruN linux-sdl12.bak/pkg-plist.i386 linux-sdl12/pkg-plist.i386
--- linux-sdl12.bak/pkg-plist.i386	Tue Oct 16 22:12:55 2001
+++ linux-sdl12/pkg-plist.i386	Wed Apr  2 22:19:28 2003
@@ -1,8 +1,8 @@
-usr/doc/SDL-1.2.2/BUGS
-usr/doc/SDL-1.2.2/COPYING
-usr/doc/SDL-1.2.2/CREDITS
-usr/doc/SDL-1.2.2/README-SDL.txt
+usr/doc/SDL-1.2.5/BUGS
+usr/doc/SDL-1.2.5/COPYING
+usr/doc/SDL-1.2.5/CREDITS
+usr/doc/SDL-1.2.5/README-SDL.txt
 usr/lib/libSDL-1.1.so.0
 usr/lib/libSDL-1.2.so.0
-usr/lib/libSDL-1.2.so.0.0.2
-@dirrm usr/doc/SDL-1.2.2
+usr/lib/libSDL-1.2.so.0.0.5
+@dirrm usr/doc/SDL-1.2.5
--- linux-sdl12.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Jan Lentfer <Jan.Lentfer@web.de>
To: freebsd-gnats-submit@FreeBSD.org, esolson@olsonexpress.com
Cc:  
Subject: Re: ports/50616: UPDATE-PORT:  devel/linux-sdl12 update to 1.2.5
Date: 15 Apr 2003 21:41:52 +0200

 This port doesn't build on my machine.
 It fails with:
 cc -DPACKAGE=\"SDL\" -DVERSION=\"1.2.5\" -DHAVE_ALLOCA=1 -I. -I. -O2
 -pipe -march=pentiumpro -D_THREAD_SAFE -DHAVE_LIBUSBHID_H -Wall
 -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_ASMBLIT -I./hermes
 -I../../../src/hermes -DOSS_SUPPORT -DESD_SUPPORT -I/usr/local/include
 -I/usr/X11R6/include -DENABLE_X11 -I./include -I./src/video -DXFREE86_VM
 -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV
 -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA -DENABLE_SVGALIB -DENABLE_AALIB
 -DHAVE_OPENGL -D_REENTRANT -D_THREAD_SAFE -DSDL_USE_PTHREADS
 -DPTHREAD_NO_RECURSIVE_MUTEX -DHAVE_SEMUN -DHAVE_LIBUSB_H
 -DHAVE_LIBUSBHID_H -DUSBHID_UCR_DATA -I../../../include
 -I../../../include/SDL -I../../../src -I../../../src/freebsd
 -I../../../src/main -I../../../src/audio -I../../../src/video
 -I../../../src/video/XFree86/extensions -I../../../src/events
 -I../../../src/joystick -I../../../src/cdrom -I../../../src/thread
 -I../../../src/timer -I../../../src/endian -I../../../src/file -c
 SDL_sysjoystick.c  -fPIC -DPIC -o .libs/SDL_sysjoystick.lo
 SDL_sysjoystick.c: In function `report_alloc':
 SDL_sysjoystick.c:410: incompatible type for argument 3 of
 `hid_report_size'
 *** Error code 1
 
 Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src/joystick/bsd.
 *** Error code 1
 
 Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src/joystick.
 *** Error code 1
 
 Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src.
 *** Error code 1
 
 Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5.
 *** Error code 1
 
 Stop in /usr/ports/devel/sdl12.
 
 
 I could solve it by adding "--disable-joystick" to the CONFIGURE_ARGS in
 the Makefile.
 
 Cheers,
 
 Jan
 
 -- 
 Jan Lentfer
 System Administrator
 Molecular Cell Biology / AG Holstein, Darmstadt University of
 Technology, Schnittspahnstr. 10, 64287 Darmstadt, Germany
 Tel: +49 6151 16 5563 / Tel private: +49 6155 899393 / mobile: +49 163
 4712037
 

From: Erik Olson <esolson@olsonexpress.com>
To: Jan Lentfer <Jan.Lentfer@web.de>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/50616: UPDATE-PORT:  devel/linux-sdl12 update to 1.2.5
Date: 15 Apr 2003 19:01:22 -0400

 Greetings.  I took a look at the output from your compile, and have a
 question for you.  Are you trying to install devel/sdl12 or
 devel/linux-sdl12?  The reasons I'm asking is because the port I'm
 working on is devel/linux-sdl12, not devel/sdl12.  It appears that your
 issue is with the straight sdl12 port.  I believe this because of the
 path listed in your sample message ( /usr/ports/devel/sdl12/work/... )
 and that there is compiling going on ( the linux-sdl12 port is an
 install only from a pre-compiled rpm ).
 
 To try and help out, I did try a compile of the devel/sdl12 port on my
 machine.  I'm sorry to say that it compiled just fine on my machine, so
 I'm not very much help.
 
 After we verify that you are trying the devel/sdl12 port, we can forward
 this message off to the maintainer of that port ( sobomax@FreeBSD.org
 ).  Perhaps they will be able to help.
 
 Sincerely,
 
 Erik Olson
 
  
 On Tue, 2003-04-15 at 15:41, Jan Lentfer wrote:
 > This port doesn't build on my machine.
 > It fails with:
 > cc -DPACKAGE=\"SDL\" -DVERSION=\"1.2.5\" -DHAVE_ALLOCA=1 -I. -I. -O2
 > -pipe -march=pentiumpro -D_THREAD_SAFE -DHAVE_LIBUSBHID_H -Wall
 > -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_ASMBLIT -I./hermes
 > -I../../../src/hermes -DOSS_SUPPORT -DESD_SUPPORT -I/usr/local/include
 > -I/usr/X11R6/include -DENABLE_X11 -I./include -I./src/video -DXFREE86_VM
 > -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV
 > -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA -DENABLE_SVGALIB -DENABLE_AALIB
 > -DHAVE_OPENGL -D_REENTRANT -D_THREAD_SAFE -DSDL_USE_PTHREADS
 > -DPTHREAD_NO_RECURSIVE_MUTEX -DHAVE_SEMUN -DHAVE_LIBUSB_H
 > -DHAVE_LIBUSBHID_H -DUSBHID_UCR_DATA -I../../../include
 > -I../../../include/SDL -I../../../src -I../../../src/freebsd
 > -I../../../src/main -I../../../src/audio -I../../../src/video
 > -I../../../src/video/XFree86/extensions -I../../../src/events
 > -I../../../src/joystick -I../../../src/cdrom -I../../../src/thread
 > -I../../../src/timer -I../../../src/endian -I../../../src/file -c
 > SDL_sysjoystick.c  -fPIC -DPIC -o .libs/SDL_sysjoystick.lo
 > SDL_sysjoystick.c: In function `report_alloc':
 > SDL_sysjoystick.c:410: incompatible type for argument 3 of
 > `hid_report_size'
 > *** Error code 1
 > 
 > Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src/joystick/bsd.
 > *** Error code 1
 > 
 > Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src/joystick.
 > *** Error code 1
 > 
 > Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5/src.
 > *** Error code 1
 > 
 > Stop in /usr/ports/devel/sdl12/work/SDL-1.2.5.
 > *** Error code 1
 > 
 > Stop in /usr/ports/devel/sdl12.
 > 
 > 
 > I could solve it by adding "--disable-joystick" to the CONFIGURE_ARGS in
 > the Makefile.
 > 
 > Cheers,
 > 
 > Jan
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Oct 3 23:57:28 PDT 2003 
State-Changed-Why:  
Commited, thanks. 
If you still want to be maintainer of devel/linux-sdl12, 
please reply to me. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50616 
>Unformatted:
