CATEGORIES+= --> CATEGORIES=

Misc variable reordering, cleaning up, etc.

3 files changed, 24 insertions, 23 deletions

diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 5b9dc31..23434d7 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -3,28 +3,29 @@
 # Date created:				6 July 1996
 # Whom: Andrey Zakhvatov <andy@cgu.chel.su>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 10:25:13 asami Exp $
 #
 
-DISTNAME=            cal-3.4
-CATEGORIES+=         misc
-MASTER_SITES=        ftp://sunsite.unc.edu/pub/Linux/utils/shell/
-MAINTAINER=          andy@cgu.chel.su
+DISTNAME=	cal-3.4
+CATEGORIES=	misc
+MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/utils/shell/
 
-WRKSRC=              ${WRKDIR}/cal34/source
-ALL_TARGET=          cal
+MAINTAINER=	andy@cgu.chel.su
+
+WRKSRC=		${WRKDIR}/cal34/source
+ALL_TARGET=	cal
 
 pre-patch:
-	@ mv ${WRKSRC}/makefile.unx ${WRKSRC}/Makefile
+	@ /bin/mv ${WRKSRC}/makefile.unx ${WRKSRC}/Makefile
 
 do-install:
-	@ install -g bin -m 0111 -o bin ${WRKSRC}/cal ${PREFIX}/bin/cal
-	@ install -g bin -m 0644 -o bin ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1
+	@${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal
+	@${INSTALL_MAN} ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1
 .if !defined{NOMANCOMPRESS}
 	@ gzip -9nf ${PREFIX}/man/man1/cal.1
 .endif
-	@ if [ ! -d ${PREFIX}/etc/cal ]; then mkdir ${PREFIX}/etc/cal; chmod 0755 ${PREFIX}/etc/cal; fi
-	@ if [ ! -f ${PREFIX}/etc/cal/calcol ]; then install -g bin -m 0444 -o bin ${WRKDIR}/cal34/cal.col ${PREFIX}/etc/cal/calcol; fi
-	@ if [ ! -f ${PREFIX}/etc/cal/caldat ]; then install -g bin -m 0444 -o bin ${WRKDIR}/cal34/cal.dat ${PREFIX}/etc/cal/caldat; fi
+	@ if [ ! -d ${PREFIX}/etc/cal ]; then ${MKDIR} ${PREFIX}/etc/cal; chmod 0755 ${PREFIX}/etc/cal; fi
+	@ if [ ! -f ${PREFIX}/etc/cal/calcol ]; then ${INSTALL_DATA} ${WRKDIR}/cal34/cal.col ${PREFIX}/etc/cal/calcol; fi
+	@ if [ ! -f ${PREFIX}/etc/cal/caldat ]; then ${INSTALL_DATA} ${WRKDIR}/cal34/cal.dat ${PREFIX}/etc/cal/caldat; fi
 
 .include <bsd.port.mk>
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 44b76a1..93ed5b5 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1995/11/26 10:47:37 asami Exp $
+# $Id: Makefile,v 1.5 1996/10/08 07:06:27 pst Exp $
 #
 
 DISTNAME=	ical-2.1b2
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/
 
 MAINTAINER=	erich@FreeBSD.org
@@ -20,8 +20,8 @@ CONFIGURE_ARGS=	--with-tclsh=/usr/bin/tclsh \
 		--with-tkconfig=${PREFIX}/lib
 
 .if !defined(NOMANCOMPRESS)
-afterinstall:
-	gzip -9nf ${PREFIX}/man/man1/ical.1
+post-install:
+	@gzip -9nf ${PREFIX}/man/man1/ical.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index f92efc7..5e1d789 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -3,12 +3,12 @@
 # Date created:         03 Aug 1996
 # Whom:                 shanee@rabbit.augusta.de
 #
-# $Id: Makefile,v 1.3 1996/08/09 20:50:42 chuckr Exp $
+# $Id: Makefile,v 1.4 1996/10/16 02:40:47 asami Exp $
 #
 
 DISTNAME=	zorro-1.1p8
 PKGNAME=	zorro-1.1.8
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
 
 MAINTAINER=	shanee@rabbit.augusta.de
@@ -18,11 +18,11 @@ LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 NO_BUILD=	yes
 
 do-install:
-	install -c -m 755 -g bin -o bin  ${WRKSRC}/zorro $(PREFIX)/bin/zorro
-	mkdir -p $(PREFIX)/share/zorro
-	install -c -m 644 -g bin -o bin $(WRKSRC)/DOTzorrorc $(PREFIX)/share/zorro
+	${INSTALL_PROGRAM} ${WRKSRC}/zorro ${PREFIX}/bin/zorro
+	${MKDIR} ${PREFIX}/share/zorro
+	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${PREFIX}/share/zorro
 	@echo ""
-	@echo "Take a look at $(PREFIX)/share/zorro/DOTzorrorc"
+	@echo "Take a look at ${PREFIX}/share/zorro/DOTzorrorc"
 	@echo ""
 
 .include <bsd.port.mk>