- remove remaining FreeBSD-ism, do not install data files in PREFIX/etc,

move them to PREFIX/share
- convert patch to unified diff
- add missing @dirrm's to PLIST

games/xbattle/Makefile

@@ -1,33 +1,29 @@
-# $OpenBSD: Makefile,v 1.3 1999/01/14 01:59:02 angelos Exp $
-#
+# $OpenBSD: Makefile,v 1.4 1999/10/01 16:02:00 brad Exp $
 
 DISTNAME=	xbattle-5.4.1
 CATEGORIES=	games
+MASTER_SITES=	ftp://cns-ftp.bu.edu/pub/xbattle/
 
 MAINTAINER=	angelos@openbsd.org
 
-MASTER_SITES=	ftp://cns-ftp.bu.edu/pub/xbattle/
-
 USE_IMAKE=	yes
 
 post-install:
-	$(MKDIR) $(PREFIX)/etc/xbattle
-	chmod 755 ${PREFIX}/etc/xbattle
-	$(CP) -R $(WRKSRC)/xbos $(PREFIX)/etc/xbattle/
-	chmod 755 ${PREFIX}/etc/xbattle/xbos
-	chmod 644 ${PREFIX}/etc/xbattle/xbos/*
-	$(CP) -R $(WRKSRC)/xbts $(PREFIX)/etc/xbattle/
-	chmod 755 ${PREFIX}/etc/xbattle/xbts
-	chmod 644 ${PREFIX}/etc/xbattle/xbts/*
-	$(CP) -R $(WRKSRC)/xbas $(PREFIX)/etc/xbattle/
-	chmod 755 ${PREFIX}/etc/xbattle/xbas
-	chmod 644 ${PREFIX}/etc/xbattle/xbas/*
-.if !defined(NOPORTDOCS)
-	$(MKDIR) $(PREFIX)/share/doc/xbattle
-	chmod 755 $(PREFIX)/share/doc/xbattle
-	$(CP) $(WRKSRC)/tutorial* $(PREFIX)/share/doc/xbattle/ 
-	$(CP) $(WRKSRC)/README $(PREFIX)/share/doc/xbattle/ 
-	chmod 644 $(PREFIX)/share/doc/xbattle/*
-.endif
+	@${MKDIR} $(PREFIX)/share/doc/xbattle
+	@${MKDIR} $(PREFIX)/share/xbattle
+	@${CP} $(WRKSRC)/tutorial* $(PREFIX)/share/doc/xbattle/ 
+	@${CP} $(WRKSRC)/README $(PREFIX)/share/doc/xbattle/ 
+	@${CP} -R $(WRKSRC)/xbas $(PREFIX)/share/xbattle/
+	@${CP} -R $(WRKSRC)/xbos $(PREFIX)/share/xbattle/
+	@${CP} -R $(WRKSRC)/xbts $(PREFIX)/share/xbattle/
+	@${CHMOD} 755 $(PREFIX)/share/doc/xbattle
+	@${CHMOD} 644 $(PREFIX)/share/doc/xbattle/*
+	@${CHMOD} 755 ${PREFIX}/share/xbattle
+	@${CHMOD} 755 ${PREFIX}/share/xbattle/xbas
+	@${CHMOD} 644 ${PREFIX}/share/xbattle/xbas/*
+	@${CHMOD} 755 ${PREFIX}/share/xbattle/xbos
+	@${CHMOD} 644 ${PREFIX}/share/xbattle/xbos/*
+	@${CHMOD} 755 ${PREFIX}/share/xbattle/xbts
+	@${CHMOD} 644 ${PREFIX}/share/xbattle/xbts/*
 
 .include <bsd.port.mk>

games/xbattle/patches/patch-aa

@@ -1,23 +1,15 @@
-*** Imakefile.orig	Tue Apr 29 16:11:52 1997
---- Imakefile	Tue Apr 29 16:13:28 1997
-***************
-*** 7,15 ****
-  #endif
-  #endif
-  
-!         DEFINES = -DDEFAULT_XBO_DIR=\"/export/home/lesher/xbos\" \
-!                   -DDEFAULT_XBT_DIR=\"/export/home/lesher/xbts\" \
-!                   -DDEFAULT_XBA_DIR=\"/export/home/lesher/xbas\"
-  LOCAL_LIBRARIES = $(XLIB)
-    SYS_LIBRARIES = -lm
-             SRCS =	command.c		\
---- 7,15 ----
-  #endif
-  #endif
-  
-!         DEFINES = -DDEFAULT_XBO_DIR=\"$(PREFIX)/etc/xbattle/xbos\" \
-!                   -DDEFAULT_XBT_DIR=\"$(PREFIX)/etc/xbattle/xbts\" \
-!                   -DDEFAULT_XBA_DIR=\"$(PREFIX)/etc/xbattle/xbas\"
-  LOCAL_LIBRARIES = $(XLIB)
-    SYS_LIBRARIES = -lm
-             SRCS =	command.c		\
+--- Imakefile.orig	Tue Oct 17 10:14:37 1995
++++ Imakefile	Fri Oct  1 11:31:21 1999
+@@ -7,9 +7,9 @@
+ #endif
+ #endif
+ 
+-        DEFINES = -DDEFAULT_XBO_DIR=\"/export/home/lesher/xbos\" \
+-                  -DDEFAULT_XBT_DIR=\"/export/home/lesher/xbts\" \
+-                  -DDEFAULT_XBA_DIR=\"/export/home/lesher/xbas\"
++        DEFINES = -DDEFAULT_XBO_DIR=\"$(PREFIX)/share/xbattle/xbos\" \
++                  -DDEFAULT_XBT_DIR=\"$(PREFIX)/share/xbattle/xbts\" \
++                  -DDEFAULT_XBA_DIR=\"$(PREFIX)/share/xbattle/xbas\"
+ LOCAL_LIBRARIES = $(XLIB)
+   SYS_LIBRARIES = -lm
+            SRCS =	command.c		\

games/xbattle/pkg/PLIST

@@ -1,19 +1,24 @@
 bin/xbattle
-etc/xbattle/xbas/simple.xba
-etc/xbattle/xbos/atlas.xbo
-etc/xbattle/xbos/default.xbo
-etc/xbattle/xbos/demo.xbo
-etc/xbattle/xbos/desert.xbo
-etc/xbattle/xbos/io.xbo
-etc/xbattle/xbos/skirmish.xbo
-etc/xbattle/xbos/space.xbo
-etc/xbattle/xbos/tribal.xbo
-etc/xbattle/xbos/tropical.xbo
-etc/xbattle/xbos/tropical2.xbo
-etc/xbattle/xbos/tundra.xbo
-etc/xbattle/xbts/castle.xbt
-etc/xbattle/xbts/natural.xbt
-man/man1/xbattle.1
+man/cat1/xbattle.0
 share/doc/xbattle/README
 share/doc/xbattle/tutorial1
 share/doc/xbattle/tutorial2
+share/xbattle/xbas/simple.xba
+share/xbattle/xbos/atlas.xbo
+share/xbattle/xbos/default.xbo
+share/xbattle/xbos/demo.xbo
+share/xbattle/xbos/desert.xbo
+share/xbattle/xbos/io.xbo
+share/xbattle/xbos/skirmish.xbo
+share/xbattle/xbos/space.xbo
+share/xbattle/xbos/tribal.xbo
+share/xbattle/xbos/tropical.xbo
+share/xbattle/xbos/tropical2.xbo
+share/xbattle/xbos/tundra.xbo
+share/xbattle/xbts/castle.xbt
+share/xbattle/xbts/natural.xbt
+@dirrm share/doc/xbattle
+@dirrm share/xbattle/xbas
+@dirrm share/xbattle/xbos
+@dirrm share/xbattle/xbts
+@dirrm share/xbattle