ports/151019: Update port: emulators/hatari version bump

Davide Italiano davide.italiano at gmail.com
Mon Sep 27 23:30:07 UTC 2010 

>Number:         151019
>Category:       ports
>Synopsis:       Update port: emulators/hatari version bump
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 27 23:30:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Davide Italiano
>Release:        9.0 (-CURRENT)
>Organization:
>Environment:
FreeBSD phemt.homenet.telecomitalia.it 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Wed Sep  1 23:18:31 CEST 2010     davide at phemt.homenet.telecomitalia.it:/usr/obj/usr/src/sys/MYKERNEL  i386

>Description:
Version bump. Please check before on tinderbox since I've some doubts about pkg-plist. ( I hope to build myself a personal tinderbox )
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN hatari-old/Makefile hatari/Makefile
--- hatari-old/Makefile	2010-09-27 22:45:56.000000000 +0200
+++ hatari/Makefile	2010-09-27 23:03:46.000000000 +0200
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	hatari
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.0
 PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	BERLIOS
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	davide.italiano at gmail.com	
 COMMENT=	An Atari ST emulator
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
@@ -19,7 +19,7 @@
 USE_BZIP2=	yes
 USE_SDL=	sdl
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MANLANG=	"" fr
diff -urN hatari-old/distinfo hatari/distinfo
--- hatari-old/distinfo	2010-09-27 22:45:56.000000000 +0200
+++ hatari/distinfo	2010-09-27 22:46:38.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (hatari-1.3.1.tar.bz2) = 112b544ec4affb7c04e931088e62a115
-SHA256 (hatari-1.3.1.tar.bz2) = ebae927ad99a029f8cd8796463df2113357a7636c2199e00290ad4a35856e0da
-SIZE (hatari-1.3.1.tar.bz2) = 1045627
+MD5 (hatari-1.4.0.tar.bz2) = 2f30e5c9e146ee92e3f2f5ae1cef3673
+SHA256 (hatari-1.4.0.tar.bz2) = 690e21bd2210a7e86af5d76ccc7f4e608aae37df466d2ead2ac4d105a637bc7b
+SIZE (hatari-1.4.0.tar.bz2) = 1260844
diff -urN hatari-old/files/patch-Makefile hatari/files/patch-Makefile
--- hatari-old/files/patch-Makefile	2010-09-27 22:45:56.000000000 +0200
+++ hatari/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
---- Makefile.orig	2009-01-24 12:12:44.000000000 -0200
-+++ Makefile	2009-11-06 21:26:15.000000000 -0200
-@@ -31,9 +31,6 @@
- 		cp -v config-default.h config.h; \
- 	fi
- 
--hatari.1.gz: doc/hatari.1
--	gzip -9 -c doc/hatari.1 > $@
--
- 
- clean:
- 	$(MAKE) -C src/ clean
-@@ -43,14 +40,12 @@
- 	$(MAKE) -C src/ distclean
- 	$(MAKE) -C tools/hmsa/ distclean
- 	$(RM) config.cache config.log Makefile.cnf config.h
--	$(RM) hatari.1.gz
--
- 
- # Use "make depend" to generate file dependencies:
- depend:
- 	$(MAKE) -C src/ depend
- 
--install: all hatari.1.gz
-+install: all
- 	@if [ "x$(INSTALL)" = "x" ]; then \
- 		echo; \
- 		echo "*** Hatari was not configured for installation. ***"; \
-@@ -58,9 +53,6 @@
- 	fi
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
--	$(INSTALL) -d $(DESTDIR)$(MANDIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/images
- 	$(INSTALL_PROGRAM) src/hatari $(DESTDIR)$(BINDIR)/hatari
- 	$(INSTALL_PROGRAM) tools/hmsa/hmsa $(DESTDIR)$(BINDIR)/hmsa
- 	$(INSTALL_SCRIPT) tools/zip2st.sh $(DESTDIR)$(BINDIR)/zip2st
-@@ -68,6 +60,3 @@
- 	if test -f src/tos.img -a \! -f $(DESTDIR)$(DATADIR)/tos.img ; then \
- 	  $(INSTALL_DATA) src/tos.img $(DESTDIR)$(DATADIR)/tos.img ; \
- 	fi
--	$(INSTALL_DATA) hatari.1.gz $(DESTDIR)$(MANDIR)/
--	$(INSTALL_DATA) doc/*.txt doc/*.html $(DESTDIR)$(DOCDIR)/
--	$(INSTALL_DATA) doc/images/*.png $(DESTDIR)$(DOCDIR)/images/
diff -urN hatari-old/files/patch-Makefile.cnf.in hatari/files/patch-Makefile.cnf.in
--- hatari-old/files/patch-Makefile.cnf.in	2010-09-27 22:45:56.000000000 +0200
+++ hatari/files/patch-Makefile.cnf.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-# This patch prevents shadowing of hatari's header
-# files by files in directories mentioned in X_CFLAGS.
---- Makefile.cnf.in	Sun Nov 22 01:43:31 2009 +0100
-+++ Makefile.cnf.in	Sun Nov 22 01:58:24 2009 +0100
-@@ -5,7 +5,7 @@
- CC = @CC@
- 
- # Set flags passed to the compiler (e.g. optimization flags)
--CFLAGS = @CFLAGS@ @X_CFLAGS@
-+CFLAGS = @CFLAGS@
- 
- # Set flags passed to the preprocessor (e.g. -I<include dir>)
- CPPFLAGS = @CPPFLAGS@
-@@ -30,7 +30,7 @@
- 
- 
- # SDL-Library configuration (compiler flags and linker options)
--SDL_CFLAGS = @SDL_CFLAGS@
-+SDL_CFLAGS = @X_CFLAGS@ @SDL_CFLAGS@
- SDL_LIBS = @SDL_LIBS@
- 
- 
diff -urN hatari-old/files/patch-tools_hmsa_Makefile hatari/files/patch-tools_hmsa_Makefile
--- hatari-old/files/patch-tools_hmsa_Makefile	2010-09-27 22:45:56.000000000 +0200
+++ hatari/files/patch-tools_hmsa_Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# This patch prevents shadowing of hatari's header
-# files by files in directories mentioned in X_CFLAGS.
---- tools/hmsa/Makefile	Sun Nov 22 01:43:31 2009 +0100
-+++ tools/hmsa/Makefile	Sun Nov 22 01:59:13 2009 +0100
-@@ -8,7 +8,7 @@
- OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
- 
- # Additional include directories:
--CPPFLAGS += $(SDL_CFLAGS) -I../.. -I../../src/includes -I../../src/uae-cpu
-+CPPFLAGS += -I../.. -I../../src/includes -I../../src/uae-cpu $(SDL_CFLAGS)
- 
- all: hmsa
- 
diff -urN hatari-old/pkg-plist hatari/pkg-plist
--- hatari-old/pkg-plist	2010-09-27 22:45:56.000000000 +0200
+++ hatari/pkg-plist	2010-09-27 23:18:40.000000000 +0200
@@ -2,7 +2,6 @@
 bin/hatari-console.py
 bin/hatariui
 bin/hmsa
-bin/zip2st
 share/applications/hatariui.desktop
 %%PORTDOCS%%%%DOCSDIR%%/authors.txt
 %%PORTDOCS%%%%DOCSDIR%%/changelog.txt
@@ -18,10 +17,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/main.png
 %%PORTDOCS%%%%DOCSDIR%%/images/memory.png
 %%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png
+%%PORTDOCS%%%%DOCSDIR%%/images/monitor.png
 %%PORTDOCS%%%%DOCSDIR%%/images/screen.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sound.png
 %%PORTDOCS%%%%DOCSDIR%%/images/system.png
 %%PORTDOCS%%%%DOCSDIR%%/images/tos.png
+%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
 %%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
@@ -30,19 +31,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%DATADIR%%/hatari-icon.bmp
-%%DATADIR%%/hatariui/Changelog
 %%DATADIR%%/hatariui/README
 %%DATADIR%%/hatariui/TODO
 %%DATADIR%%/hatariui/config.py
 %%DATADIR%%/hatariui/debugui.py
 %%DATADIR%%/hatariui/dialogs.py
-%%DATADIR%%/hatariui/hatari-icon.png
 %%DATADIR%%/hatariui/hatari.png
 %%DATADIR%%/hatariui/hatari.py
+%%DATADIR%%/hatariui/hatari-icon.png
 %%DATADIR%%/hatariui/hatariui.py
+%%DATADIR%%/hatariui/release-notes.txt
 %%DATADIR%%/hatariui/uihelpers.py
 %%DATADIR%%/tos.img
-share/pixmaps/hatari-icon.png
 @dirrm %%DATADIR%%/hatariui
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list