>Number:         33158
>Category:       pkg
>Synopsis:       Update from 1.4.1 to 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 27 11:20:00 +0000 2006
>Originator:     pancake@phreaker.net
>Release:        Linux 2.6.15bare
>Organization:
	
>Environment:
	
	
System: Linux bare 2.6.15bare #7 PREEMPT Tue Mar 14 14:34:34 CET 2006 i686 GNU/Linux
Architecture: unknown
Machine: i686
>Description:
	This package now uses a configure script that simplifies the package
	build and install. (patches have been removed)
	
>How-To-Repeat:
	
>Fix:
	

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/stella/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile	5 Feb 2006 23:09:03 -0000	1.28
+++ Makefile	27 Mar 2006 11:08:36 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.28 2006/02/05 23:09:03 joerg Exp $
 
-STELLA_VERSION=	1.4.1
+STELLA_VERSION=	2.1
 DISTNAME=	stella-${STELLA_VERSION}-src
 PKGNAME=	stella-${STELLA_VERSION}
-PKGREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
 
@@ -11,17 +10,14 @@
 HOMEPAGE=	http://stella.sourceforge.net/
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
-PATCHDIR=               ${.CURDIR}/../stella/patches
-DISTINFO_FILE=          ${.CURDIR}/../stella/distinfo
-
-WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/src/build
+WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 USE_INSTALL=	YES
 UNLIMIT_RESOURCES=datasize
 
-MAKEFILE=	makefile
-BUILD_TARGET=	linux
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS= --prefix=${PREFIX}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=	3.0
@@ -29,21 +25,6 @@
 
 MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:Q}\ -fno-rtti
 
-DOCDIR=${PREFIX}/share/doc/html/stella
-DATADIR=${PREFIX}/share/stella
-
-INSTALLATION_DIRS=	bin
-
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/stella ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/graphics
-	${INSTALL_DATA} ${WRKSRC}/../../docs/stella.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../../docs/graphics/* ${DOCDIR}/graphics
-	${INSTALL_DATA_DIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../emucore/stella.pro ${DATADIR}
-
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/stella/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	13 Aug 2004 16:12:25 -0000	1.3
+++ PLIST	27 Mar 2006 11:08:36 -0000
@@ -1,14 +1,36 @@
-@comment $NetBSD: PLIST,v 1.3 2004/08/13 16:12:25 dillo Exp $
+@comment $NetBSD$
 bin/stella
-share/doc/html/stella/graphics/chucky_cheese.png
-share/doc/html/stella/graphics/circuit.png
-share/doc/html/stella/graphics/console.png
-share/doc/html/stella/graphics/jr_pacman.png
-share/doc/html/stella/graphics/pacman.png
-share/doc/html/stella/graphics/secret_quest.png
-share/doc/html/stella/graphics/space_invaders.png
-share/doc/html/stella/stella.html
+share/doc/stella/Announce.txt
+share/doc/stella/Changes.txt
+share/doc/stella/Copyright.txt
+share/doc/stella/debugger.html
+share/doc/stella/graphics/chucky_cheese.png
+share/doc/stella/graphics/circuit.png
+share/doc/stella/graphics/console.png
+share/doc/stella/graphics/eventmapping.png
+share/doc/stella/graphics/eventmapping_remap.png
+share/doc/stella/graphics/jr_pacman.png
+share/doc/stella/graphics/launcher_options_rom.png
+share/doc/stella/graphics/launcher_options_snap.png
+share/doc/stella/graphics/launcher.png
+share/doc/stella/graphics/options_about.png
+share/doc/stella/graphics/options_audio.png
+share/doc/stella/graphics/options_gameinfo.png
+share/doc/stella/graphics/options_help.png
+share/doc/stella/graphics/options_video.png
+share/doc/stella/graphics/pacman.png
+share/doc/stella/graphics/rom_browser.png
+share/doc/stella/graphics/secret_quest.png
+share/doc/stella/graphics/space_invaders.png
+share/doc/stella/License.txt
+share/doc/stella/README-PSP.txt
+share/doc/stella/README-SDL.txt
+share/doc/stella/Readme.txt
+share/doc/stella/stella.html
+share/doc/stella/Todo.txt
+share/icons/stella.xpm
 share/stella/stella.pro
-@dirrm share/doc/html/stella/graphics
-@dirrm share/doc/html/stella
 @dirrm share/stella
+@dirrm share/icons
+@dirrm share/doc/stella/graphics
+@dirrm share/doc/stella
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/stella/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	23 Feb 2005 18:49:20 -0000	1.6
+++ distinfo	27 Mar 2006 11:08:36 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.6 2005/02/23 18:49:20 agc Exp $
 
-SHA1 (stella-1.4.1-src.tar.gz) = 085650e00b7d077f9da0069b327f9c9bbec893e4
-RMD160 (stella-1.4.1-src.tar.gz) = b000bd9e7b5c7cb9c29ebec519adff6479250663
-Size (stella-1.4.1-src.tar.gz) = 707079 bytes
+SHA1 (stella-2.1-src.tar.gz) = 2ab0163a24ad877d81dc8f9ee77cfd1482194e14
+RMD160 (stella-2.1-src.tar.gz) = 7ddecbcc78bf0ddd3a0aedf924f00b69e2ec6013
+Size (stella-2.1-src.tar.gz) = 1062215 bytes
 SHA1 (patch-aa) = 893d5ad5165f02c2dfde5d07c348362aba36d340
 SHA1 (patch-ab) = a7d13dd26b7656385c09fda306b8272dd3feae4c

>Unformatted: