Attachment #109941 for bug #151019

View | Details | Raw Unified | Return to bug 151019
Collapse All | Expand All




#

PORTNAME=	hatari
PORTVERSION=	1.4.0
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	BERLIOS

MAINTAINER=	davide.italiano@gmail.com	
COMMENT=	An Atari ST emulator

LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png

USE_BZIP2=	yes
USE_SDL=	sdl
USE_GMAKE=	yes
HAS_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

MANLANG=	"" fr

Lines 1-3 Link Here

(-)hatari/distinfo (-3 / +3 lines)
1	MD5 (hatari-1.3.1.tar.bz2) = 112b544ec4affb7c04e931088e62a115	1	MD5 (hatari-1.4.0.tar.bz2) = 2f30e5c9e146ee92e3f2f5ae1cef3673
2	SHA256 (hatari-1.3.1.tar.bz2) = ebae927ad99a029f8cd8796463df2113357a7636c2199e00290ad4a35856e0da	2	SHA256 (hatari-1.4.0.tar.bz2) = 690e21bd2210a7e86af5d76ccc7f4e608aae37df466d2ead2ac4d105a637bc7b
3	SIZE (hatari-1.3.1.tar.bz2) = 1045627	3	SIZE (hatari-1.4.0.tar.bz2) = 1260844




--- 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/




# 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@
 
 




# 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
 




bin/hatari-console.py
bin/hatariui
bin/hmsa
bin/zip2st
share/applications/hatariui.desktop
%%PORTDOCS%%%%DOCSDIR%%/authors.txt
%%PORTDOCS%%%%DOCSDIR%%/changelog.txt

%%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

%%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

Return to bug 151019

Lines 6-17 Link Here

(-)hatari/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= hatari	8	PORTNAME= hatari
9	PORTVERSION= 1.3.1	9	PORTVERSION= 1.4.0
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= emulators	11	CATEGORIES= emulators
12	MASTER_SITES= BERLIOS	12	MASTER_SITES= BERLIOS
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= davide.italiano@gmail.com
15	COMMENT= An Atari ST emulator	15	COMMENT= An Atari ST emulator
16		16
17	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png	17	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
Lines 19-25 Link Here
19	USE_BZIP2= yes	19	USE_BZIP2= yes
20	USE_SDL= sdl	20	USE_SDL= sdl
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	22	HAS_CONFIGURE= yes
23	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	23	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
24		24
25	MANLANG= "" fr	25	MANLANG= "" fr

Lines 1-45 Link Here

(-)hatari/files/patch-Makefile (-45 lines)
1	--- Makefile.orig 2009-01-24 12:12:44.000000000 -0200
2	+++ Makefile 2009-11-06 21:26:15.000000000 -0200
3	@@ -31,9 +31,6 @@
4	cp -v config-default.h config.h; \
5	fi
6
7	-hatari.1.gz: doc/hatari.1
8	- gzip -9 -c doc/hatari.1 > $@
9	-
10
11	clean:
12	$(MAKE) -C src/ clean
13	@@ -43,14 +40,12 @@
14	$(MAKE) -C src/ distclean
15	$(MAKE) -C tools/hmsa/ distclean
16	$(RM) config.cache config.log Makefile.cnf config.h
17	- $(RM) hatari.1.gz
18	-
19
20	# Use "make depend" to generate file dependencies:
21	depend:
22	$(MAKE) -C src/ depend
23
24	-install: all hatari.1.gz
25	+install: all
26	@if [ "x$(INSTALL)" = "x" ]; then \
27	echo; \
28	echo "* Hatari was not configured for installation. *"; \
29	@@ -58,9 +53,6 @@
30	fi
31	$(INSTALL) -d $(DESTDIR)$(BINDIR)
32	$(INSTALL) -d $(DESTDIR)$(DATADIR)
33	- $(INSTALL) -d $(DESTDIR)$(MANDIR)
34	- $(INSTALL) -d $(DESTDIR)$(DOCDIR)
35	- $(INSTALL) -d $(DESTDIR)$(DOCDIR)/images
36	$(INSTALL_PROGRAM) src/hatari $(DESTDIR)$(BINDIR)/hatari
37	$(INSTALL_PROGRAM) tools/hmsa/hmsa $(DESTDIR)$(BINDIR)/hmsa
38	$(INSTALL_SCRIPT) tools/zip2st.sh $(DESTDIR)$(BINDIR)/zip2st
39	@@ -68,6 +60,3 @@
40	if test -f src/tos.img -a \! -f $(DESTDIR)$(DATADIR)/tos.img ; then \
41	$(INSTALL_DATA) src/tos.img $(DESTDIR)$(DATADIR)/tos.img ; \
42	fi
43	- $(INSTALL_DATA) hatari.1.gz $(DESTDIR)$(MANDIR)/
44	- $(INSTALL_DATA) doc/.txt doc/.html $(DESTDIR)$(DOCDIR)/
45	- $(INSTALL_DATA) doc/images/*.png $(DESTDIR)$(DOCDIR)/images/

Lines 1-22 Link Here

(-)hatari/files/patch-Makefile.cnf.in (-22 lines)
1	# This patch prevents shadowing of hatari's header
2	# files by files in directories mentioned in X_CFLAGS.
3	--- Makefile.cnf.in Sun Nov 22 01:43:31 2009 +0100
4	+++ Makefile.cnf.in Sun Nov 22 01:58:24 2009 +0100
5	@@ -5,7 +5,7 @@
6	CC = @CC@
7
8	# Set flags passed to the compiler (e.g. optimization flags)
9	-CFLAGS = @CFLAGS@ @X_CFLAGS@
10	+CFLAGS = @CFLAGS@
11
12	# Set flags passed to the preprocessor (e.g. -I<include dir>)
13	CPPFLAGS = @CPPFLAGS@
14	@@ -30,7 +30,7 @@
15
16
17	# SDL-Library configuration (compiler flags and linker options)
18	-SDL_CFLAGS = @SDL_CFLAGS@
19	+SDL_CFLAGS = @X_CFLAGS@ @SDL_CFLAGS@
20	SDL_LIBS = @SDL_LIBS@
21
22

Lines 1-13 Link Here

(-)hatari/files/patch-tools_hmsa_Makefile (-13 lines)
1	# This patch prevents shadowing of hatari's header
2	# files by files in directories mentioned in X_CFLAGS.
3	--- tools/hmsa/Makefile Sun Nov 22 01:43:31 2009 +0100
4	+++ tools/hmsa/Makefile Sun Nov 22 01:59:13 2009 +0100
5	@@ -8,7 +8,7 @@
6	OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
7
8	# Additional include directories:
9	-CPPFLAGS += $(SDL_CFLAGS) -I../.. -I../../src/includes -I../../src/uae-cpu
10	+CPPFLAGS += -I../.. -I../../src/includes -I../../src/uae-cpu $(SDL_CFLAGS)
11
12	all: hmsa
13

Lines 2-8 Link Here

(-)hatari/pkg-plist (-4 / +4 lines)
2	bin/hatari-console.py	2	bin/hatari-console.py
3	bin/hatariui	3	bin/hatariui
4	bin/hmsa	4	bin/hmsa
5	bin/zip2st
6	share/applications/hatariui.desktop	5	share/applications/hatariui.desktop
7	%%PORTDOCS%%%%DOCSDIR%%/authors.txt	6	%%PORTDOCS%%%%DOCSDIR%%/authors.txt
8	%%PORTDOCS%%%%DOCSDIR%%/changelog.txt	7	%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
Lines 18-27 Link Here
18	%%PORTDOCS%%%%DOCSDIR%%/images/main.png	17	%%PORTDOCS%%%%DOCSDIR%%/images/main.png
19	%%PORTDOCS%%%%DOCSDIR%%/images/memory.png	18	%%PORTDOCS%%%%DOCSDIR%%/images/memory.png
20	%%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png	19	%%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png
		20	%%PORTDOCS%%%%DOCSDIR%%/images/monitor.png
21	%%PORTDOCS%%%%DOCSDIR%%/images/screen.png	21	%%PORTDOCS%%%%DOCSDIR%%/images/screen.png
22	%%PORTDOCS%%%%DOCSDIR%%/images/sound.png	22	%%PORTDOCS%%%%DOCSDIR%%/images/sound.png
23	%%PORTDOCS%%%%DOCSDIR%%/images/system.png	23	%%PORTDOCS%%%%DOCSDIR%%/images/system.png
24	%%PORTDOCS%%%%DOCSDIR%%/images/tos.png	24	%%PORTDOCS%%%%DOCSDIR%%/images/tos.png
		25	%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
25	%%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt	26	%%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt
26	%%PORTDOCS%%%%DOCSDIR%%/manual.html	27	%%PORTDOCS%%%%DOCSDIR%%/manual.html
27	%%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt	28	%%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
Lines 30-48 Link Here
30	%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt	31	%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
31	%%PORTDOCS%%%%DOCSDIR%%/todo.txt	32	%%PORTDOCS%%%%DOCSDIR%%/todo.txt
32	%%DATADIR%%/hatari-icon.bmp	33	%%DATADIR%%/hatari-icon.bmp
33	%%DATADIR%%/hatariui/Changelog
34	%%DATADIR%%/hatariui/README	34	%%DATADIR%%/hatariui/README
35	%%DATADIR%%/hatariui/TODO	35	%%DATADIR%%/hatariui/TODO
36	%%DATADIR%%/hatariui/config.py	36	%%DATADIR%%/hatariui/config.py
37	%%DATADIR%%/hatariui/debugui.py	37	%%DATADIR%%/hatariui/debugui.py
38	%%DATADIR%%/hatariui/dialogs.py	38	%%DATADIR%%/hatariui/dialogs.py
39	%%DATADIR%%/hatariui/hatari-icon.png
40	%%DATADIR%%/hatariui/hatari.png	39	%%DATADIR%%/hatariui/hatari.png
41	%%DATADIR%%/hatariui/hatari.py	40	%%DATADIR%%/hatariui/hatari.py
		41	%%DATADIR%%/hatariui/hatari-icon.png
42	%%DATADIR%%/hatariui/hatariui.py	42	%%DATADIR%%/hatariui/hatariui.py
		43	%%DATADIR%%/hatariui/release-notes.txt
43	%%DATADIR%%/hatariui/uihelpers.py	44	%%DATADIR%%/hatariui/uihelpers.py
44	%%DATADIR%%/tos.img	45	%%DATADIR%%/tos.img
45	share/pixmaps/hatari-icon.png
46	@dirrm %%DATADIR%%/hatariui	46	@dirrm %%DATADIR%%/hatariui
47	@dirrm %%DATADIR%%	47	@dirrm %%DATADIR%%
48	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images	48	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images