From 3658cb69164d87994099b24340f06a30f37dd521 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Thu, 10 Apr 2003 01:28:03 +0000
Subject: make ${PAX} usage consistent:

- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup
---
 x11/egtk/Makefile | 14 +++++++-------
 x11/tk/Makefile   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'x11')

diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index 0d506f4128c..779d2e73827 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:31 grant Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
@@ -22,7 +22,7 @@ post-extract:
 	${FIND} ${WRKSRC} -type f -name "*.ace" -print | ${XARGS} ${RM} -f
 	${RMDIR} ${WRKSRC}/examples/toolbar
 	${RM} ${WRKSRC}/examples/Makefile
-	cd ${WRKSRC}/C/se; ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se clean
+	cd ${WRKSRC}/C/se && ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se clean
 	${MV} ${WRKSRC}/bin/egtkbuild ${WRKSRC}/bin/egtkbuild.in
 	${MV} ${WRKSRC}/man/egtkbuild.1 ${WRKSRC}/man/egtkbuild.1.in
 
@@ -35,7 +35,7 @@ do-configure:
 		${FILESDIR}/loadpath.se.in > ${WRKDIR}/loadpath.se
 
 do-build:
-	cd ${WRKSRC}/C/se; ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se
+	cd ${WRKSRC}/C/se && ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/egtkbuild ${PREFIX}/bin
@@ -43,19 +43,19 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/C/se/eif_gtk.a ${PREFIX}/lib/libegtk_se.a
 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/egtk
-	cd ${WRKSRC}/lib; ${PAX} -rw * ${PREFIX}/share/egtk
-	cd ${WRKSRC}; ${PAX} -rw pixmaps ${PREFIX}/share/egtk
+	cd ${WRKSRC}/lib && ${PAX} -rw * ${PREFIX}/share/egtk
+	cd ${WRKSRC} && ${PAX} -rw pixmaps ${PREFIX}/share/egtk
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/egtk
 	${INSTALL_DATA_DIR} ${PREFIX}/share/egtk/se
 	${INSTALL_DATA} ${WRKSRC}/C/se/cecil.se ${PREFIX}/share/egtk/se
 	${INSTALL_DATA} ${WRKSRC}/C/se/eif_gtk_se.c ${PREFIX}/share/egtk/se
 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/egtk
-	cd ${WRKSRC}/examples; ${PAX} -rw * ${PREFIX}/share/examples/egtk
+	cd ${WRKSRC}/examples && ${PAX} -rw * ${PREFIX}/share/examples/egtk
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/egtk
 
 post-install:
-	cd ${WRKSRC}; ${INSTALL_DATA} copyright forum.txt ${PREFIX}/share/egtk
+	cd ${WRKSRC} && ${INSTALL_DATA} copyright forum.txt ${PREFIX}/share/egtk
 	${INSTALL_DATA} ${WRKDIR}/loadpath.se ${PREFIX}/share/egtk/se
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 8def681d0d2..7bba500297b 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/03/29 12:43:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/04/10 01:28:32 grant Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -50,7 +50,7 @@ pre-install:
 
 post-install:
 	${CHMOD} -R ugo-w ${WRKDIR}/man
-	cd ${WRKDIR}; ${PAX} -rw man ${PREFIX}
+	cd ${WRKDIR} && ${PAX} -rw man ${PREFIX}
 	${CHMOD} -R ug+rw ${WRKDIR}/man
 	${RM} -f ${PREFIX}/bin/wish
 	cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
-- 
cgit v1.2.3