Variable reordering to standards.

3 files changed, 42 insertions, 45 deletions

diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 5863d3787506..a0e5a26dbe0b 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:24:25 asami Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
@@ -15,9 +15,19 @@ MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.cs.city.ac.uk:/pub/games/crossfire/ \
 		ftp://ftp.sunet.se:/pub/unix/games/crossfire/ \
 		ftp://ftp.cs.titech.ac.jp:/pub/games/crossfire/
+DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
+		${CF_ARCH} ${CF_CLSERV}
 
 MAINTAINER=	andreas@klemm.gtn.com
 
+BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
+
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
+USE_IMAKE=	yes
+PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go 
 # into the workdir and to build everything manually. 
@@ -32,20 +42,9 @@ CF_DOC=		crossfire-0.92.8.doc.tar.gz	# crossfire doc ready for use
 CF_ARCH=	crossfire-0.92.8.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
-
-DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
-		${CF_ARCH} ${CF_CLSERV}
-
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
-
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
-
-USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem 
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
@@ -57,8 +56,8 @@ post-configure:
 post-install:
 	(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
 	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	mkdir -p ${CFDIR}/doc
-	cp -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
+	${MKDIR} ${CFDIR}/doc
+	${CP} -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
 	touch ${PREFIX}/crossfire/lib/bookarch
 	chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	chown -R games.games ${CFDIR}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 5863d3787506..a0e5a26dbe0b 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:24:25 asami Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
@@ -15,9 +15,19 @@ MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.cs.city.ac.uk:/pub/games/crossfire/ \
 		ftp://ftp.sunet.se:/pub/unix/games/crossfire/ \
 		ftp://ftp.cs.titech.ac.jp:/pub/games/crossfire/
+DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
+		${CF_ARCH} ${CF_CLSERV}
 
 MAINTAINER=	andreas@klemm.gtn.com
 
+BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
+
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
+USE_IMAKE=	yes
+PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go 
 # into the workdir and to build everything manually. 
@@ -32,20 +42,9 @@ CF_DOC=		crossfire-0.92.8.doc.tar.gz	# crossfire doc ready for use
 CF_ARCH=	crossfire-0.92.8.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
-
-DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
-		${CF_ARCH} ${CF_CLSERV}
-
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
-
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
-
-USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem 
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
@@ -57,8 +56,8 @@ post-configure:
 post-install:
 	(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
 	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	mkdir -p ${CFDIR}/doc
-	cp -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
+	${MKDIR} ${CFDIR}/doc
+	${CP} -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
 	touch ${PREFIX}/crossfire/lib/bookarch
 	chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	chown -R games.games ${CFDIR}
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 5863d3787506..a0e5a26dbe0b 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:24:25 asami Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
@@ -15,9 +15,19 @@ MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.cs.city.ac.uk:/pub/games/crossfire/ \
 		ftp://ftp.sunet.se:/pub/unix/games/crossfire/ \
 		ftp://ftp.cs.titech.ac.jp:/pub/games/crossfire/
+DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
+		${CF_ARCH} ${CF_CLSERV}
 
 MAINTAINER=	andreas@klemm.gtn.com
 
+BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
+
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
+USE_IMAKE=	yes
+PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go 
 # into the workdir and to build everything manually. 
@@ -32,20 +42,9 @@ CF_DOC=		crossfire-0.92.8.doc.tar.gz	# crossfire doc ready for use
 CF_ARCH=	crossfire-0.92.8.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
-
-DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
-		${CF_ARCH} ${CF_CLSERV}
-
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
-
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
-
-USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem 
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
@@ -57,8 +56,8 @@ post-configure:
 post-install:
 	(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
 	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	mkdir -p ${CFDIR}/doc
-	cp -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
+	${MKDIR} ${CFDIR}/doc
+	${CP} -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
 	touch ${PREFIX}/crossfire/lib/bookarch
 	chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	chown -R games.games ${CFDIR}