1. Correct MASTER_SITES.

2. Sort pkg/PLIST.

4 files changed, 140 insertions, 127 deletions

diff --git a/security/cops/Makefile b/security/cops/Makefile
index 7acae3dcd72a..a2e7f93facd0 100644
--- a/security/cops/Makefile
+++ b/security/cops/Makefile
@@ -1,38 +1,38 @@
-# new ports collection makefile for:	cops
+# New ports collection makefile for:	cops
 # Version required:			1.04
 # Date created:				29 August 1996
 # Whom:					oly
 #
-# $Id: Makefile,v 1.2 1996/11/17 19:29:55 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/18 07:31:46 obrien Exp $
 #
 
-DISTNAME=	cops_104
+DISTNAME=	cops.1.04
 PKGNAME=	cops-1.04
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cert.org/pub/tools/cops/1.04/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.cert.org/pub/tools/cops/
 
 MAINTAINER=	oly@world.std.com
 
-EXECUTABLE = home.chk user.chk is_writable crc crc_check \
-             addto clearfiles filewriters members tilde is_able
-C_SRC      = home.chk.c user.chk.c is_able.c is_something.c \
-             addto.c clearfiles.c filewriters.c members.c tilde.c \
-             crc.c crc_check.c
+WRKSRC=		${WRKDIR}/cops_104
+EXECUTABLE=	home.chk user.chk is_writable crc crc_check \
+		addto clearfiles filewriters members tilde is_able
+C_SRC=		home.chk.c user.chk.c is_able.c is_something.c \
+		addto.c clearfiles.c filewriters.c members.c tilde.c \
+		crc.c crc_check.c
 
 pre-build:
 	(cd ${WRKSRC} ; ./reconfig)
 	(cd ${WRKSRC} ; \
-	sed 's,^SECURE=/usr/foo/bar,SECURE=${PREFIX}/cops,g' < cops | sed '/^$$SECURE\/passwd\.chk.*/d' | sed 's,SECURE_USERS="foo@bar\.edu",SECURE_USERS="root@localhost",g' | sed 's/passwd\.chk pass.chk //g' > cops.out ; \
-	mv cops.out cops ; chmod u+x cops)
+	${SED} 's,^SECURE=/usr/foo/bar,SECURE=${PREFIX}/cops,g' < cops | ${SED} '/^$$SECURE\/passwd\.chk.*/d' | ${SED} 's,SECURE_USERS="foo@bar\.edu",SECURE_USERS="root@localhost",g' | ${SED} 's/passwd\.chk pass.chk //g' > cops.out ; \
+	${MV} cops.out cops ; chmod u+x cops)
 
 do-build:
 	(cd ${WRKSRC} ; make EXECUTABLE="${EXECUTABLE}" C_SRC="${C_SRC}")
 
 do-install:
-	(cd ${WRKDIR} ; rm -rf ${PREFIX}/cops ; ${MKDIR} ${PREFIX}/cops ; \
-	${CP} -R ${DISTNAME}/* ${PREFIX}/cops ; \
+	(cd ${WRKSRC} ; ${RM} -rf ${PREFIX}/cops ; ${MKDIR} ${PREFIX}/cops ; \
+	${CP} -R * ${PREFIX}/cops ; \
 	chmod -R go-rwx ${PREFIX}/cops ; \
-	rm -rf ${PREFIX}/cops/*.old ${PREFIX}/cops/src)
+	${RM} -rf ${PREFIX}/cops/*.old ${PREFIX}/cops/src)
 
 .include <bsd.port.mk>
diff --git a/security/cops/distinfo b/security/cops/distinfo
index 7b46aed7221f..5695b788f275 100644
--- a/security/cops/distinfo
+++ b/security/cops/distinfo
@@ -1 +1 @@
-MD5 (cops_104.tar.Z) = 1fa416872934e5bee99068f9989cb8b0
+MD5 (cops.1.04.tar.gz) = dc28e7985fc28fb61138470c11eecbe5
diff --git a/security/cops/files/patch-ab b/security/cops/files/patch-ab
new file mode 100644
index 000000000000..f8085d545af0
--- /dev/null
+++ b/security/cops/files/patch-ab
@@ -0,0 +1,11 @@
+--- makefile.orig	Wed Jun  3 22:17:30 1998
++++ makefile	Wed Jun  3 22:17:35 1998
+@@ -20,7 +20,7 @@
+ SUPPORT    = is_able.lst suid.stop crc_list
+ 
+ #
+-CFLAGS     = -O
++#CFLAGS     = -O
+ # sequents need "-lseq" as well... uncomment this if you're running on one:
+ # SEQFLAGS   = -lseq
+ 
diff --git a/security/cops/pkg-plist b/security/cops/pkg-plist
index a30b02fee2ad..8377e5ab4247 100644
--- a/security/cops/pkg-plist
+++ b/security/cops/pkg-plist
@@ -1,103 +1,104 @@
-cops/extra_src/uucp_1.shar
-cops/extra_src/mail.chk
-cops/extra_src/trust.pl
-cops/extra_src/bad_dir.pl
-cops/extra_src/stop.make
-cops/extra_src/README
-cops/extra_src/uucp_quick.chk
-cops/extra_src/uucp_2.shar
-cops/extra_src/rhosts_sweeper
-cops/extra_src/pass.mail
-cops/extra_src/diff_last.sh
+cops/carp/How2Change
+cops/carp/README
+cops/carp/carp
+cops/carp/carp.1
+cops/carp/carp.anlz
+cops/carp/carp.anlz.1
+cops/carp/carp.awk
+cops/carp/carp.table
+cops/carp/carp2ps
+cops/carp/carp2ps.1
+cops/checkacct/Article
+cops/checkacct/Intro
+cops/checkacct/Makefile
+cops/checkacct/README.FIRST
+cops/checkacct/bsd.m4
+cops/checkacct/ca.src
+cops/checkacct/chkacct.1l
+cops/checkacct/dotwrite
+cops/checkacct/effect.dotwrit
+cops/checkacct/effect.owners
+cops/checkacct/effect.read
+cops/checkacct/effect.rhosts
+cops/checkacct/effect.setuid
+cops/checkacct/effect.write
+cops/checkacct/owners
+cops/checkacct/prm.mm
+cops/checkacct/prompt.help
+cops/checkacct/readable
+cops/checkacct/rhosts
+cops/checkacct/rhosts.pl
+cops/checkacct/setuid
+cops/checkacct/sysV.m4
+cops/checkacct/write
+cops/docs/COPS.report
+cops/docs/COPS.tex
+cops/docs/CRC.README
 cops/docs/KUANG.README
 cops/docs/SUID.README
+cops/docs/bug.chk
 cops/docs/cops
+cops/docs/cron.chk
 cops/docs/dev.chk
-cops/docs/CRC.README
+cops/docs/ftp.chk
+cops/docs/group.chk
 cops/docs/home.chk
-cops/docs/pass.chk
 cops/docs/is_able
+cops/docs/is_able.chk
+cops/docs/is_writable
 cops/docs/kuang.1
 cops/docs/kuang.man
-cops/docs/rc.chk
-cops/docs/is_able.chk
-cops/docs/release.notes
-cops/docs/suid.man
-cops/docs/tilde
-cops/docs/warnings
-cops/docs/root.chk
-cops/docs/cron.chk
-cops/docs/group.chk
-cops/docs/pass_diff.chk
-cops/docs/user.chk
 cops/docs/makefile
-cops/docs/passwd.chk
-cops/docs/ftp.chk
+cops/docs/makefile.old
 cops/docs/misc.chk
-cops/docs/COPS.tex
-cops/docs/readme.sequent
-cops/docs/is_writable
+cops/docs/obligitory.album
+cops/docs/obligitory.joke
+cops/docs/pass.chk
+cops/docs/pass_diff.chk
+cops/docs/passwd.chk
+cops/docs/rc.chk
 cops/docs/readme.C2
 cops/docs/readme.apollo
+cops/docs/readme.filter
 cops/docs/readme.ibm
+cops/docs/readme.sequent
 cops/docs/readme.shadow
 cops/docs/readme.svr4
 cops/docs/readme.xenix
 cops/docs/readme.yp
-cops/docs/bug.chk
-cops/docs/readme.filter
-cops/docs/obligitory.joke
-cops/docs/obligitory.album
-cops/docs/COPS.report
-cops/docs/makefile.old
-cops/extensions/writing.suid
+cops/docs/release.notes
+cops/docs/root.chk
+cops/docs/suid.man
+cops/docs/tilde
+cops/docs/warnings
+cops/docs/user.chk
+cops/extensions/THINGS_2_DO
 cops/extensions/YAR
 cops/extensions/crypto-stuff
 cops/extensions/netstuff
 cops/extensions/passwords
 cops/extensions/questions
+cops/extensions/writing.suid
 cops/extensions/uucp.hardening
-cops/extensions/THINGS_2_DO
-cops/checkacct/write
-cops/checkacct/Intro
-cops/checkacct/Makefile
-cops/checkacct/README.FIRST
-cops/checkacct/bsd.m4
-cops/checkacct/ca.src
-cops/checkacct/chkacct.1l
-cops/checkacct/dotwrite
-cops/checkacct/effect.dotwrit
-cops/checkacct/effect.owners
-cops/checkacct/effect.read
-cops/checkacct/effect.rhosts
-cops/checkacct/effect.setuid
-cops/checkacct/effect.write
-cops/checkacct/owners
-cops/checkacct/prm.mm
-cops/checkacct/prompt.help
-cops/checkacct/readable
-cops/checkacct/rhosts
-cops/checkacct/rhosts.pl
-cops/checkacct/setuid
-cops/checkacct/sysV.m4
-cops/checkacct/Article
-cops/carp/How2Change
-cops/carp/carp
-cops/carp/carp.anlz
-cops/carp/carp.table
-cops/carp/carp.awk
-cops/carp/carp.anlz.1
-cops/carp/carp2ps
-cops/carp/carp2ps.1
-cops/carp/README
-cops/carp/carp.1
-cops/perl/README.sgi
+cops/extra_src/README
+cops/extra_src/bad_dir.pl
+cops/extra_src/diff_last.sh
+cops/extra_src/mail.chk
+cops/extra_src/pass.mail
+cops/extra_src/rhosts_sweeper
+cops/extra_src/stop.make
+cops/extra_src/trust.pl
+cops/extra_src/uucp_1.shar
+cops/extra_src/uucp_2.shar
+cops/extra_src/uucp_quick.chk
 cops/perl/README.kuang
-cops/perl/cops.cf.orig
-cops/perl/cops.cf
+cops/perl/README.sgi
 cops/perl/chk_strings
 cops/perl/chk_strings.pl
 cops/perl/cops
+cops/perl/cops.orig
+cops/perl/cops.cf
+cops/perl/cops.cf.orig
 cops/perl/cron.chk
 cops/perl/dev.chk
 cops/perl/fgrep.pl
@@ -111,8 +112,8 @@ cops/perl/group.chk
 cops/perl/hostname.pl
 cops/perl/is_able.chk
 cops/perl/is_able.lst
-cops/perl/kuang
 cops/perl/is_able.pl
+cops/perl/kuang
 cops/perl/kuang.1
 cops/perl/misc.chk
 cops/perl/pass.chk
@@ -120,81 +121,82 @@ cops/perl/pass.cache.pl
 cops/perl/passwd.chk
 cops/perl/pathconf.pl
 cops/perl/pathconf.sh
+cops/perl/prl.patch
 cops/perl/rc.chk
 cops/perl/reconfig.pl
 cops/perl/root.chk
 cops/perl/rules.pl
+cops/perl/shadow.sh
 cops/perl/stat.pl
 cops/perl/suckline.pl
 cops/perl/suid.chk
 cops/perl/suid.stop
 cops/perl/user.chk
 cops/perl/yagrip.pl
-cops/perl/prl.patch
-cops/perl/shadow.sh
+cops/MANIFEST
+cops/README.FIRST
+cops/README.1
+cops/README.2.pl
+cops/README.2.sh
+cops/README.3
+cops/XTRA_CREDIT
+cops/addto
+cops/bug.chk
 cops/bug.chk.aix
-cops/cops
+cops/bug.chk.apollo
+cops/bug.chk.dec
+cops/bug.chk.next
+cops/bug.chk.sgi
+cops/bug.chk.sun
+cops/bug.chk.svr4
 cops/bug_cmp
+cops/chk_strings
+cops/clearfiles
+cops/cops
+cops/cops_filter
 cops/cover_letter
+cops/crc
+cops/crc_check
 cops/crc.chk
 cops/crc_list
 cops/cron.chk
 cops/dev.chk
-cops/bug.chk.dec
 cops/disclaimer
-cops/bug.chk.sgi
+cops/file.paths
+cops/filewriters
 cops/ftp.chk
-cops/kuang
 cops/group.chk
+cops/home.chk
 cops/init_kuang
+cops/is_able
 cops/is_able.chk
-cops/rc.chk
 cops/is_able.lst
+cops/is_writable
+cops/kuang
 cops/kuang.pl.shar
 cops/makefile
+cops/makefile.orig
+cops/members
 cops/misc.chk
 cops/pass.words
 cops/pass_diff.chk
-cops/bug.chk.sun
+cops/passwd.chk
 cops/patchlevel.h
-cops/quick_start
-cops/bug.chk.apollo
-cops/bug.chk.next
-cops/bug.chk.svr4
 cops/platform
-cops/cops_filter
+cops/quick_start
+cops/rc.chk
 cops/reconfig
 cops/res_diff
 cops/root.chk
 cops/suid.chk
-cops/yp_pass.chk
-cops/README.2.sh
-cops/README.2.pl
-cops/README.FIRST
 cops/suid.stop
-cops/file.paths
-cops/home.chk
 cops/user.chk
-cops/is_writable
-cops/crc
-cops/crc_check
-cops/addto
-cops/members
-cops/clearfiles
-cops/filewriters
+cops/yp_pass.chk
 cops/tilde
-cops/MANIFEST
-cops/is_able
-cops/bug.chk
-cops/README.1
-cops/README.3
-cops/passwd.chk
-cops/XTRA_CREDIT
-cops/chk_strings
 @dirrm cops/carp
-@dirrm cops/perl
 @dirrm cops/checkacct
-@dirrm cops/extra_src
-@dirrm cops/extensions
 @dirrm cops/docs
+@dirrm cops/extensions
+@dirrm cops/extra_src
+@dirrm cops/perl
 @dirrm cops