Module Name:	pkgsrc
Committed By:	rh
Date:		Sat Dec 30 20:12:18 UTC 2000

Modified Files:
	pkgsrc/security/sslwrap/files: patch-sum
	pkgsrc/security/sslwrap/patches: patch-aa patch-ab
Added Files:
	pkgsrc/security/sslwrap: Makefile
	pkgsrc/security/sslwrap/files: md5
	pkgsrc/security/sslwrap/pkg: COMMENT DESCR PLIST

Log Message:
Resolve conflicts from earlier import (the package was apparently already
added and then deleted again during the last freeze)


To generate a diff of this commit:
cvs rdiff -r0 -r1.3 pkgsrc/security/sslwrap/Makefile
cvs rdiff -r0 -r1.3 pkgsrc/security/sslwrap/files/md5
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/security/sslwrap/files/patch-sum
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/security/sslwrap/patches/patch-aa \
    pkgsrc/security/sslwrap/patches/patch-ab
cvs rdiff -r0 -r1.3 pkgsrc/security/sslwrap/pkg/COMMENT \
    pkgsrc/security/sslwrap/pkg/DESCR pkgsrc/security/sslwrap/pkg/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.