===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Makefile,v
retrieving revision 1.224
retrieving revision 1.225
diff -c -r1.224 -r1.225
*** src/etc/Makefile	2005/05/02 06:47:32	1.224
--- src/etc/Makefile	2005/05/15 23:41:37	1.225
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.224 2005/05/02 06:47:32 david Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.225 2005/05/15 23:41:37 david Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
***************
*** 261,276 ****
  	-cp ${DESTDIR}/snapshot/cdbr ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/*BOOT* ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/cd*.iso ${RELEASEDIR}
- 	-cp ${DESTDIR}/snapshot/*.ipk ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/Packages ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/INSTALL.* ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/*.fs ${DESTDIR}/snapshot/*.fs.gz ${RELEASEDIR}
  	-cd ${RELEASEDIR}; \
  		md5 *bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* Packages *.fs \
! 		*.ipk *.iso *.gz *.tgz > MD5
  	-cd ${RELEASEDIR}; \
  		cksum *bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* Packages *.fs \
! 		*.ipk *.iso *.gz *.tgz > CKSUM
  .if defined(MACHINE_HAS_TOOLS)
  	mkdir -p ${RELEASEDIR}/tools
  	cp ${DESTDIR}/snapshot/tools/* ${RELEASEDIR}/tools
--- 261,275 ----
  	-cp ${DESTDIR}/snapshot/cdbr ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/*BOOT* ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/cd*.iso ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/Packages ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/INSTALL.* ${RELEASEDIR}
  	-cp ${DESTDIR}/snapshot/*.fs ${DESTDIR}/snapshot/*.fs.gz ${RELEASEDIR}
  	-cd ${RELEASEDIR}; \
  		md5 *bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* Packages *.fs \
! 		*.iso *.gz *.tgz > MD5
  	-cd ${RELEASEDIR}; \
  		cksum *bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* Packages *.fs \
! 		*.iso *.gz *.tgz > CKSUM
  .if defined(MACHINE_HAS_TOOLS)
  	mkdir -p ${RELEASEDIR}/tools
  	cp ${DESTDIR}/snapshot/tools/* ${RELEASEDIR}/tools
***************
*** 377,383 ****
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.224 2005/05/02 06:47:32 david Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \
--- 376,382 ----
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.225 2005/05/15 23:41:37 david Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \