Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Jan 17 16:02:34 UTC 2000

Modified Files:
	pkgsrc/net/speakfreely: Makefile
	pkgsrc/net/speakfreely/files: patch-sum
	pkgsrc/net/speakfreely/patches: patch-aa patch-ab patch-ac patch-ad
	    patch-ae patch-af
Added Files:
	pkgsrc/net/speakfreely/patches: patch-ag patch-ah patch-ai
Removed Files:
	pkgsrc/net/speakfreely: Makefile.common

Log Message:
Merge net/speakfreely and net/speakfreely-crypto.  Allow building without
using patented IDEA algorithm.  Uses two new make variables which may be
defined in mk.conf:

	USE_CRYPTO:	YES, NO
	USE_IDEA:	YES, NO

Defaults to building with crypto but without IDEA.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 pkgsrc/net/speakfreely/Makefile
cvs rdiff -r1.2 -r0 pkgsrc/net/speakfreely/Makefile.common
cvs rdiff -r1.2 -r1.3 pkgsrc/net/speakfreely/files/patch-sum
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/speakfreely/patches/patch-aa \
    pkgsrc/net/speakfreely/patches/patch-ac \
    pkgsrc/net/speakfreely/patches/patch-ad \
    pkgsrc/net/speakfreely/patches/patch-ae
cvs rdiff -r1.2 -r1.3 pkgsrc/net/speakfreely/patches/patch-ab \
    pkgsrc/net/speakfreely/patches/patch-af
cvs rdiff -r0 -r1.1 pkgsrc/net/speakfreely/patches/patch-ag \
    pkgsrc/net/speakfreely/patches/patch-ah \
    pkgsrc/net/speakfreely/patches/patch-ai

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