- Support CC/X11BASE properly

- Support install macros
- freebsd.org -> FreeBSD.org
- Change location of data files from lib/ to share/
- Exclude GPL doc from package

PR: 22742
Submitted by: Ports Fury

3 files changed, 65 insertions, 32 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index de9835fa3f01..e7bbd9c0b89a 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	atari800
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.signus.demon.co.uk/Software/Portable/Atari800e/ \
 		http://cas3.zlin.vutbr.cz/~stehlik/a800/
 DISTNAME=	Atari800-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -29,22 +30,21 @@ NO_PACKAGE=	${RESTRICTED}
 ATARI_DOC=	${PREFIX}/share/doc/atari
 ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
 		demos2.xfd dos25.xfd mydos45d.atr
-ATARI_LIB=	${PREFIX}/lib/atari
+ATARI_LIB=	${PREFIX}/share/atari
 SED_CONFIG=	${ATARI_LIB:S/\//\\\//g}
-DOC_FILES= 	BUGS CHANGES COPYING CREDITS INSTALL README TODO USAGE
+DOC_FILES= 	BUGS CHANGES CREDITS INSTALL README TODO USAGE
 
 MAN1=		atari800.1
 
 post-extract:
 	@${ECHO_MSG} "===>  Unzipping ROM files"
-	unzip -Lo ${DISTDIR}/${DIST_SUBDIR}/${EXTRA_FILES} ${ATARI_XF}\
-		-d ${WRKSRC}/
+	unzip -q -L -o ${_DISTDIR}/${EXTRA_FILES} ${ATARI_XF} -d ${WRKSRC}
 	@${ECHO_MSG} "===>  Processing configuration file"
 	${SED} "s/GUMBY/${SED_CONFIG}/g" < ${FILESDIR}/atari800.cfg \
 		> ${WRKSRC}/atari800.cfg
 
 	@${ECHO_MSG} "===>  Copying config.h to work directory"
-	${CP} ${FILESDIR}/config.h ${WRKSRC}/
+	${CP} ${FILESDIR}/config.h ${WRKSRC}
 
 	@${ECHO_MSG} "===>  Copying UNIX makefile"
 	${CP} ${WRKSRC}/Makefile.unix ${WRKSRC}/Makefile
@@ -60,20 +60,19 @@ post-patch:
 post-install:
 	@${ECHO_MSG} "===>  Installing files from xf25.zip"
 	-${MKDIR} ${ATARI_LIB}
-	for file in ${ATARI_XF} ; do \
-		${INSTALL_DATA} ${WRKSRC}/$$file ${ATARI_LIB}/ ;\
-	done
+.for file in ${ATARI_XF}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${ATARI_LIB}
+.endfor
 
 	@${ECHO_MSG} "===>  Installing configuration file"
-	${INSTALL} -c -o root -g wheel -m 664 ${WRKSRC}/atari800.cfg \
-		${ATARI_LIB}/
+	${INSTALL_DATA} -m 664 ${WRKSRC}/atari800.cfg ${ATARI_LIB}
 
-.if (!defined(NOPORTDOCS))
+.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>  Installing distribution document files"
 	-${MKDIR} ${ATARI_DOC}
-	for file in ${DOC_FILES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/$$file ${ATARI_DOC}/ ;\
-	done
+.for file in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${ATARI_DOC}
+.endfor
 	${INSTALL_DATA} ${DESCR} ${ATARI_DOC}/README.FreeBSD
 .endif
 
diff --git a/emulators/atari800/files/patch-aa b/emulators/atari800/files/patch-aa
index 4671df3467d9..d10b78b80558 100644
--- a/emulators/atari800/files/patch-aa
+++ b/emulators/atari800/files/patch-aa
@@ -1,12 +1,16 @@
---- Makefile.orig	Sun Feb  6 16:38:57 2000
-+++ Makefile	Sun Feb  6 16:40:45 2000
-@@ -6,12 +6,12 @@
+--- Makefile.unix	Sat Feb 21 10:39:13 1998
++++ Makefile	Wed Nov  8 01:54:54 2000
+@@ -4,14 +4,14 @@
+ #       if they cause a problem on your system.
+ #
  
- CC		= gcc
+-CC		= gcc
++CC		?= gcc
  CPPFLAGS	= $(OTHER)
 -CFLAGS		= -c -O6 -DGNU_C
-+CFLAGS+=	  -c -DGNU_C
- LD		= gcc
+-LD		= gcc
++CFLAGS		+= -c -DGNU_C
++LD		= $(CC)
  LDFLAGS		=
  LDLIBS		= -lm
  
@@ -15,6 +19,29 @@
  BIN_PATH	= ${PREFIX}/bin
  LIB_PATH	= ${PREFIX}/lib
  MAN_PATH	= ${PREFIX}/man
+@@ -195,16 +195,16 @@
+ 		OBJ="atari_curses.o"
+ 
+ freebsd-x11 :
+-	make atari800 \
+-		CPPFLAGS="-I/usr/X11R6/include" \
+-		LDFLAGS="-L/usr/X11R6/lib" \
++	$(MAKE) atari800 \
++		CPPFLAGS="-I${X11BASE}/include" \
++		LDFLAGS="-L${X11BASE}/lib" \
+ 		LDLIBS="-lX11 -lm" \
+ 		OBJ="atari_x11.o"
+ 
+ freebsd-x11-shm :
+-	make atari800 \
+-		CPPFLAGS="-I/usr/X11R6/include -DSHM" \
+-		LDFLAGS="-L/usr/X11R6/lib" \
++	$(MAKE) atari800 \
++		CPPFLAGS="-I${X11BASE}/include -DSHM" \
++		LDFLAGS="-L${X11BASE}/lib" \
+ 		LDLIBS="-lX11 -lXext -lm" \
+ 		OBJ="atari_x11.o"
+ 
 @@ -246,7 +246,6 @@
  			platform.h
  
@@ -23,3 +50,11 @@
  
  configure	:	configure.o prompts.o
  	$(LD) $(LDFLAGS) configure.o prompts.o $(LDLIBS) -o configure
+@@ -348,5 +347,5 @@
+ 	chmod 4755 ${BIN_PATH}/atari800
+ 
+ install :
+-	cp atari800 ${BIN_PATH}/atari800
+-	cp atari800.man ${MAN_PATH}/man1/atari800.1
++	${BSD_INSTALL_PROGRAM} atari800 ${BIN_PATH}/atari800
++	${BSD_INSTALL_MAN} atari800.man ${MAN_PATH}/man1/atari800.1
diff --git a/emulators/atari800/pkg-plist b/emulators/atari800/pkg-plist
index 81e2fad882cc..4a715ff3ff49 100644
--- a/emulators/atari800/pkg-plist
+++ b/emulators/atari800/pkg-plist
@@ -1,20 +1,19 @@
 bin/atari800
+share/atari/atari800.cfg
+share/atari/ataribas.rom
+share/atari/atariosb.rom
+share/atari/atarixl.rom
+share/atari/demos1.xfd
+share/atari/demos2.xfd
+share/atari/dos25.xfd
+share/atari/mydos45d.atr
 share/doc/atari/BUGS
 share/doc/atari/CHANGES
-share/doc/atari/COPYING
 share/doc/atari/CREDITS
 share/doc/atari/INSTALL
 share/doc/atari/README
+share/doc/atari/README.FreeBSD
 share/doc/atari/TODO
 share/doc/atari/USAGE
-share/doc/atari/README.FreeBSD
-lib/atari/atari800.cfg
-lib/atari/ataribas.rom
-lib/atari/atariosb.rom
-lib/atari/atarixl.rom
-lib/atari/demos1.xfd
-lib/atari/demos2.xfd
-lib/atari/dos25.xfd
-lib/atari/mydos45d.atr
 @dirrm share/doc/atari
-@dirrm lib/atari
+@dirrm share/atari