Share Makefile, update patch sum.

4 files changed, 74 insertions, 115 deletions

diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile
index e6c7c4f3bbe..cc2211224c6 100644
--- a/shells/zsh-current/Makefile
+++ b/shells/zsh-current/Makefile
@@ -1,67 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/06/29 03:05:28 uebayasi Exp $
-
-DISTNAME=       zsh-4.1.1
-CATEGORIES=	shells
-MASTER_SITES=   ftp://ftp.rge.com/pub/shells/zsh/ \
-		ftp://sunsite.auc.dk/pub/unix/shells/zsh/ \
-		ftp://ftp.uit.no/pub/unix/shells/zsh/ \
-		ftp://ftp.net.lut.ac.uk/zsh/ \
-		ftp://ftp.zsh.org/zsh/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	gcw@zsh.org
-HOMEPAGE=	http://sunsite.dk/zsh/
-COMMENT=	The Z shell
-
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-GNU_CONFIGURE=		yes
-INFO_FILES=		zsh.info
-TEXINFO_OVERRIDE=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(ZSH_STATIC)
-CONFIGURE_ARGS+=--disable-dynamic
-LDFLAGS+=	-static
-.else
-.if ${OPSYS} == "SunOS"
-PLIST_SRC=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-.else
-LDFLAGS+=	-Wl,${RPATH_FLAG}${PREFIX}/lib/zsh
-PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-.endif
-.endif
-
-.undef MANZ
-
-PKG_SHELL=	${PREFIX}/bin/zsh
-
-post-install:
-	@cd ${WRKSRC}/Doc; ${MAKE} install.info
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh
-	@cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS	\
-		${PREFIX}/share/doc/zsh
-
-# Utilize Zsh's test framework.
+# $NetBSD: Makefile,v 1.4 2003/06/29 04:24:57 uebayasi Exp $
 #
-.PHONY: do-test do-su-test real-su-test
-
-do-test: do-su-test
-
-do-su-test:
-	@${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO_MSG} "*** Warning: This test needs to be run as root"
-	@${_PKG_SILENT}${_PKG_DEBUG}					\
-	realtarget="real-su-test";					\
-	action="install";						\
-	${_SU_TARGET}
+.include "../../shells/zsh/Makefile.common"
 
-real-su-test:
-	@${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
-	@cd ${WRKSRC} && ${MAKE} check
-	@cd ${WRKSRC}/Test && ${MAKE} clean
+ZSH_VERSION=	4.1.1
+ZSH_MAINTAINER=	uebayasi@netbsd.org
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo
index bc9a6daa5b4..d00e691cdd7 100644
--- a/shells/zsh-current/distinfo
+++ b/shells/zsh-current/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/06/29 03:05:28 uebayasi Exp $
+$NetBSD: distinfo,v 1.5 2003/06/29 04:24:57 uebayasi Exp $
 
 SHA1 (zsh-4.1.1.tar.bz2) = a47a6e698530d89988ed12dc7aaa6428e7336c5e
 Size (zsh-4.1.1.tar.bz2) = 1924514 bytes
-SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
 SHA1 (patch-ac) = fb983a8d7281f97023be5ea8df505b9eab93b32f
 SHA1 (patch-ad) = 744b188c8d273238ce74ea37e9f77a53800ac823
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 17c514936c3..7e0684b7de2 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,55 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2003/06/20 05:59:02 uebayasi Exp $
+# $NetBSD: Makefile,v 1.41 2003/06/29 04:24:56 uebayasi Exp $
+#
+.include "../../shells/zsh/Makefile.common"
 
-DISTNAME=       zsh-4.0.7
-CATEGORIES=	shells
-MASTER_SITES=   ftp://sunsite.dk/pub/unix/shells/zsh/ \
-		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
-		ftp://ftp.lysator.liu.se/pub/unix/zsh/ \
-		ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
-		http://www.math.technion.ac.il/pub/zsh/ \
-		ftp://ftp.zsh.org/zsh/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	gcw@zsh.org
-HOMEPAGE=	http://sunsite.dk/zsh/
-COMMENT=	The Z shell
-
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-GNU_CONFIGURE=		yes
-INFO_FILES=		zsh.info
-TEXINFO_OVERRIDE=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(ZSH_STATIC)
-CONFIGURE_ARGS+=--disable-dynamic
-LDFLAGS+=	-static
-.else
-.if ${OPSYS} == "SunOS"
-PLIST_SRC=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-.else
-LDFLAGS+=	-Wl,${RPATH_FLAG}${PREFIX}/lib/zsh
-PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-.endif
-.endif
-
-.undef MANZ
-
-PKG_SHELL=	${PREFIX}/bin/zsh
-
-post-install:
-	@cd ${WRKSRC}/Doc; ${MAKE} install.info
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh
-	@cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS	\
-		${PREFIX}/share/doc/zsh
-
-test:
-	@if [ `${ID} -u` != 0 ]; then					\
-		${ECHO_MSG} "You must be root to run this target.";	\
-	else								\
-		(cd ${WRKSRC}; ${MAKE} check)				\
-	fi
+ZSH_VERSION=	4.0.7
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
new file mode 100644
index 00000000000..aa414235ae5
--- /dev/null
+++ b/shells/zsh/Makefile.common
@@ -0,0 +1,65 @@
+# $NetBSD: Makefile.common,v 1.1 2003/06/29 04:24:56 uebayasi Exp $
+
+DISTNAME=       zsh-${ZSH_VERSION}
+CATEGORIES=	shells
+MASTER_SITES=   ftp://sunsite.dk/pub/unix/shells/zsh/ \
+		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
+		ftp://ftp.lysator.liu.se/pub/unix/zsh/ \
+		ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
+		http://www.math.technion.ac.il/pub/zsh/ \
+		ftp://ftp.zsh.org/zsh/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	${ZSH_MAINTAINER}
+HOMEPAGE=	http://sunsite.dk/zsh/
+COMMENT=	The Z shell
+
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
+INFO_FILES=		zsh.info
+TEXINFO_OVERRIDE=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(ZSH_STATIC)
+CONFIGURE_ARGS+=--disable-dynamic
+LDFLAGS+=	-static
+.else
+.if ${OPSYS} == "SunOS"
+PLIST_SRC=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
+.else
+LDFLAGS+=	-Wl,${RPATH_FLAG}${PREFIX}/lib/zsh
+PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
+.endif
+.endif
+
+.undef MANZ
+
+PKG_SHELL=	${PREFIX}/bin/zsh
+
+post-install:
+	@cd ${WRKSRC}/Doc; ${MAKE} install.info
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh
+	@cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS	\
+		${PREFIX}/share/doc/zsh
+
+# Utilize Zsh's test framework.
+#
+.PHONY: do-test do-su-test real-su-test
+
+do-test: do-su-test
+
+do-su-test:
+	@${_PKG_SILENT}${_PKG_DEBUG}					\
+	${ECHO_MSG} "*** Warning: This test needs to be run as root"
+	@${_PKG_SILENT}${_PKG_DEBUG}					\
+	realtarget="real-su-test";					\
+	action="install";						\
+	${_SU_TARGET}
+
+real-su-test:
+	@${_PKG_SILENT}${_PKG_DEBUG}					\
+	${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
+	@cd ${WRKSRC} && ${MAKE} check
+	@cd ${WRKSRC}/Test && ${MAKE} clean