Index: head/devel/tcl-trf/Makefile =================================================================== --- head/devel/tcl-trf/Makefile (revision 54821) +++ head/devel/tcl-trf/Makefile (revision 54822) @@ -1,53 +1,65 @@ # New ports collection makefile for: tcl-Trf # Date created: May 22, 2000 # Whom: Mikhail Teterin # # $FreeBSD$ # PORTNAME= Trf PORTVERSION= 2.1p2 +PORTREVISION= 1 CATEGORIES= devel tcl83 MASTER_SITES= http://www.oche.de/~akupries/soft/trf/download/ PKGNAMEPREFIX= tcl- DISTNAME= trf${PORTVERSION} MAINTAINER= mi@aldan.algebra.com BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//} USE_BZIP2= yes ALL_TARGET= all test MAKE_ARGS+= -j2 TCL_VER?= 8.3 DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf MAKE_ENV+= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \ INSTALL_DATA="${INSTALL_DATA}" HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} \ --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER} \ --enable-static-zlib --enable-static-bzlib \ --enable-static-md5 -CONFIGURE_ENV+= CFLAGS_OPTIMIZE="${CFLAGS}" +post-extract: + ${RM} -rf ${WRKSRC}/compat + +post-patch: + # Make direct calls to -lbz2 + ${PERL} -pi -e 's,bz\.([^(]+),BZ2_bz\u\1,g' \ + ${WRKSRC}/generic/bz2.c + # Make direct calls to -lz + ${PERL} -pi -e 's,zf\.([^(]+),\1,g' ${WRKSRC}/generic/adler.c \ + ${WRKSRC}/generic/crc_zlib.c ${WRKSRC}/generic/zip.c + post-install: ${LN} -sf ${SHLIB_NAME} ${PREFIX}/lib/${SHLIB_LINK} .ifndef(NOPORTDOCS) ${RM} -f ${WRKSRC}/doc/html/*.orig ${MKDIR} ${DOCSDIR} ${CP} -pR ${WRKSRC}/doc/html/* ${DOCSDIR} + ${CHMOD} -R +r ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/painless-guide-to-crc.txt ${DOCSDIR} .endif .include .if exists(${WRKSRC}/${MAKEFILE}) SHLIB_NAME!= ${MAKE} -f ${WRKSRC}/${MAKEFILE} -V Trf_LIB_FILE SHLIB_LINK= ${SHLIB_NAME:C/\.so\..*/.so/} .endif PLIST_SUB+= SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} Property changes on: head/devel/tcl-trf/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/tcl-trf/files/patch-bz2_opt =================================================================== --- head/devel/tcl-trf/files/patch-bz2_opt (nonexistent) +++ head/devel/tcl-trf/files/patch-bz2_opt (revision 54822) @@ -0,0 +1,16 @@ +--- generic/bz2_opt.c Sat Nov 18 17:42:31 2000 ++++ generic/bz2_opt.c Fri Feb 15 14:09:36 2002 +@@ -182,13 +182,4 @@ + + /* +- * 'bz2' is used, therefore load the required library. +- * And bail out if it is not available. +- */ +- +- if (TCL_OK != TrfLoadBZ2lib (interp)) { +- return TCL_ERROR; +- } +- +- /* + * Now perform the real option check. + */ Property changes on: head/devel/tcl-trf/files/patch-bz2_opt ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/tcl-trf/files/patch-crypt =================================================================== --- head/devel/tcl-trf/files/patch-crypt (revision 54821) +++ head/devel/tcl-trf/files/patch-crypt (revision 54822) @@ -1,25 +1,25 @@ --- generic/crypt.c Sat Nov 18 17:42:31 2000 +++ generic/crypt.c Fri Feb 8 11:59:47 2002 @@ -112,4 +112,6 @@ */ -+char *crypt_md5(const char *pw, const char *salt); /* Live in -lscrypt */ ++char *crypt_md5(const char *pw, const char *salt); /* Lives in -lcrypt */ + static int TrfMd5CryptObjCmd (notUsed, interp, objc, objv) @@ -128,8 +130,4 @@ Tcl_Obj* res; - if (TrfLoadMD5 (interp) != TCL_OK) { - return TCL_ERROR; - } - if (objc != 3) { Tcl_AppendResult (interp, @@ -159,5 +157,5 @@ TrfLock; - res = Tcl_NewStringObj ((char*) md5f.crypt (passwd, salt_b) + 3, -1); + res = Tcl_NewStringObj (crypt_md5(passwd, salt_b) + 3, -1); TrfUnlock; Property changes on: head/devel/tcl-trf/files/patch-crypt ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/tcl-trf/files/patch-loadman =================================================================== --- head/devel/tcl-trf/files/patch-loadman (revision 54821) +++ head/devel/tcl-trf/files/patch-loadman (revision 54822) @@ -1,53 +1,29 @@ ---- generic/loadman.h Tue Mar 27 08:08:31 2001 -+++ generic/loadman.h Fri Feb 8 11:31:51 2002 -@@ -48,8 +48,7 @@ +Use FreeBSD's native md2 and sha implementations instead of those from +the OpenSSL library. + + -mi + +--- generic/loadman.h Fri Feb 15 14:49:06 2002 ++++ generic/loadman.h Fri Feb 15 14:50:48 2002 +@@ -48,9 +48,5 @@ #ifdef HAVE_MD2_H -# ifdef OPENSSL_SUB -# include -# else -# include +-# endif +# include -+# ifndef MD2_DIGEST_LENGTH -+# define MD2_DIGEST_LENGTH 16 - # endif #else -@@ -58,15 +57,10 @@ + # include "../compat/md2.h" +@@ -58,9 +54,5 @@ #ifdef HAVE_SHA_H -# ifdef OPENSSL_SUB -# include -# else -# include -# endif +# include #else # include "../compat/sha.h" - #endif - --#include "../md5-crypt/md5.h" -- -+#include - - #ifdef TCL_STORAGE_CLASS -@@ -87,4 +81,5 @@ - */ - -+#if 0 - typedef struct Md2Functions { - long loaded; -@@ -114,7 +109,4 @@ - } sha1Functions; - -- -- -- - /* Global variables containing the vectors declared above. 99% of the time they - * are read, but during load a write is required, which has to be protected by -@@ -125,4 +117,6 @@ - EXTERN md5Functions md5f; /* THREADING: serialize initialization */ - EXTERN sha1Functions sha1f; /* THREADING: serialize initialization */ -+ -+#endif - - Property changes on: head/devel/tcl-trf/files/patch-loadman ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/tcl-trf/files/patch-md2 =================================================================== --- head/devel/tcl-trf/files/patch-md2 (revision 54821) +++ head/devel/tcl-trf/files/patch-md2 (revision 54822) @@ -1,128 +1,131 @@ --- generic/md2.c Wed Aug 9 15:13:17 2000 -+++ generic/md2.c Fri Feb 8 10:43:36 2002 -@@ -30,11 +30,6 @@ ++++ generic/md2.c Fri Feb 15 14:55:50 2002 +@@ -30,13 +30,8 @@ #include "loadman.h" -/* - * Generator description - * --------------------- - * - * The MD2 alogrithm is used to compute a cryptographically strong - * message digest. - */ +#include +#include - #define DIGEST_SIZE (MD2_DIGEST_LENGTH) +-#define DIGEST_SIZE (MD2_DIGEST_LENGTH) ++#define DIGEST_SIZE 16 + #define CTX_TYPE MD2_CTX + @@ -59,9 +54,9 @@ sizeof (CTX_TYPE), DIGEST_SIZE, - MDmd2_Start, + MD2Init, MDmd2_Update, - MDmd2_UpdateBuf, + MD2Update, MDmd2_Final, - MDmd2_Check + NULL }; @@ -94,30 +89,4 @@ *------------------------------------------------------* * - * MDmd2_Start -- - * - * ------------------------------------------------* - * Initialize the internal state of the message - * digest generator. - * ------------------------------------------------* - * - * Sideeffects: - * As of the called procedure. - * - * Result: - * None. - * - *------------------------------------------------------* - */ - -static void -MDmd2_Start (context) -VOID* context; -{ - md2f.init ((MD2_CTX*) context); -} - -/* - *------------------------------------------------------* - * * MDmd2_Update -- * @@ -143,33 +112,5 @@ unsigned char buf = character; - md2f.update ((MD2_CTX*) context, &buf, 1); -} - -/* - *------------------------------------------------------* - * - * MDmd2_UpdateBuf -- - * - * ------------------------------------------------* - * Update the internal state of the message digest - * generator for a character buffer. - * ------------------------------------------------* - * - * Sideeffects: - * As of the called procedure. - * - * Result: - * None. - * - *------------------------------------------------------* - */ - -static void -MDmd2_UpdateBuf (context, buffer, bufLen) -VOID* context; -unsigned char* buffer; -int bufLen; -{ - md2f.update ((MD2_CTX*) context, (unsigned char*) buffer, bufLen); + MD2Update ((MD2_CTX*) context, &buf, 1); } @@ -198,31 +139,4 @@ VOID* digest; { - md2f.final ((unsigned char*) digest, (MD2_CTX*) context); -} - -/* - *------------------------------------------------------* - * - * MDmd2_Check -- - * - * ------------------------------------------------* - * Do global one-time initializations of the message - * digest generator. - * ------------------------------------------------* - * - * Sideeffects: - * Loads the shared library containing the - * MD2 functionality - * - * Result: - * A standard Tcl error code. - * - *------------------------------------------------------* - */ - -static int -MDmd2_Check (interp) -Tcl_Interp* interp; -{ - return TrfLoadMD2 (interp); + MD2Final ((unsigned char*) digest, (MD2_CTX*) context); } Property changes on: head/devel/tcl-trf/files/patch-md2 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/tcl-trf/files/patch-mkin =================================================================== --- head/devel/tcl-trf/files/patch-mkin (revision 54821) +++ head/devel/tcl-trf/files/patch-mkin (revision 54822) @@ -1,70 +1,77 @@ --- Makefile.in Tue Aug 21 01:52:21 2001 -+++ Makefile.in Fri Feb 15 01:37:36 2002 ++++ Makefile.in Fri Feb 15 15:02:35 2002 @@ -34,5 +34,5 @@ #======================================================================== -lib_BINARIES = $(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE) $(MD5_LIB_FILE) +lib_BINARIES = $(Trf_LIB_FILE) $(Trf_STUB_LIB_FILE) BINARIES = $(lib_BINARIES) @@ -82,4 +82,5 @@ $(TRF_GENSRCDIR)/md5dig.c \ $(TRF_GENSRCDIR)/haval.c \ + $(TRF_GENSRCDIR)/haval.1996/haval.c \ $(TRF_GENSRCDIR)/sha.c \ $(TRF_GENSRCDIR)/adler.c \ -@@ -125,5 +126,4 @@ - TRF_BASE_OBJ = @DL_OBJS@ bz2lib.$(OBJEXT) \ - zlib.$(OBJEXT) \ +@@ -123,7 +124,5 @@ + $(TRF_COMPRESS_OBJ) + +-TRF_BASE_OBJ = @DL_OBJS@ bz2lib.$(OBJEXT) \ +- zlib.$(OBJEXT) \ - loadman.$(OBJEXT) \ ++TRF_BASE_OBJ = @DL_OBJS@ \ init.$(OBJEXT) \ registry.$(OBJEXT) \ -@@ -157,4 +157,5 @@ +@@ -157,4 +156,5 @@ md5dig.$(OBJEXT) \ haval.$(OBJEXT) \ + haval-1996.$(OBJEXT) \ sha.$(OBJEXT) \ adler.$(OBJEXT) \ -@@ -191,5 +192,5 @@ +@@ -191,5 +191,5 @@ #======================================================================== -Trf_LIB_FILE = @Trf_LIB_FILE@ +Trf_LIB_FILE = libTrf2.so.1 $(Trf_LIB_FILE)_OBJECTS = $(Trf_OBJECTS) -@@ -301,5 +302,5 @@ +@@ -301,8 +301,8 @@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lmd ++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lmd -lbz2 -lz STLIB_LD = @STLIB_LD@ TCL_BIN_DIR = @TCL_BIN_DIR@ -@@ -346,5 +347,5 @@ +-TCL_DEFS = @TCL_DEFS@ ++TCL_DEFS = @TCL_DEFS@ -DHAVE_BZLIB_H + TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ + TCL_LD_FLAGS = @TCL_LD_FLAGS@ +@@ -346,5 +346,5 @@ LIBS = @LIBS@ AR = ar -CFLAGS = @CFLAGS@ +CFLAGS += @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -431,5 +432,5 @@ +@@ -431,5 +431,5 @@ check: test -test: +test: $(Trf_LIB_FILE) LD_LIBRARY_PATH="$(srcdir):../tea/:$(ZLIB_LIB_DIR):$(SSL_LIB_DIR)"; \ export LD_LIBRARY_PATH; \ -@@ -612,4 +613,7 @@ +@@ -612,4 +612,7 @@ $(COMPILE) -c `@CYGPATH@ $(TRF_GENSRCDIR)/haval.c` -o $@ +haval-1996.o: $(TRF_GENSRCDIR)/haval.1996/haval.c + $(COMPILE) -c `@CYGPATH@ $(TRF_GENSRCDIR)/haval.1996/haval.c` -o $@ + sha.$(OBJEXT): $(TRF_GENSRCDIR)/sha.c $(COMPILE) -c `@CYGPATH@ $(TRF_GENSRCDIR)/sha.c` -o $@ -@@ -755,5 +759,5 @@ +@@ -755,5 +758,5 @@ done if test "x$(MAKE_LIB)" = "x$(MAKE_SHARED_LIB)"; then \ - $(TCLSH_PROG) mkIndex.tcl $(lib_BINARIES); \ + $(TCLSH_PROG) mkIndex.tcl $(Trf_LIB_FILE); \ fi Property changes on: head/devel/tcl-trf/files/patch-mkin ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/tcl-trf/files/patch-zlib =================================================================== --- head/devel/tcl-trf/files/patch-zlib (nonexistent) +++ head/devel/tcl-trf/files/patch-zlib (revision 54822) @@ -0,0 +1,100 @@ +--- generic/adler.c Wed Aug 9 15:13:17 2000 ++++ generic/adler.c Fri Feb 15 15:09:44 2002 +@@ -63,5 +63,5 @@ + MDAdler_UpdateBuf, + MDAdler_Final, +- MDAdler_Check ++ NULL + }; + +@@ -222,36 +222,2 @@ + out [3] = (char) ((adler >> 0) & 0xff); + } +- +-/* +- *------------------------------------------------------* +- * +- * MDAdler_Check -- +- * +- * ------------------------------------------------* +- * Check for existence of libz, load it. +- * ------------------------------------------------* +- * +- * Sideeffects: +- * As of the called procedure. +- * +- * Result: +- * None. +- * +- *------------------------------------------------------* +- */ +- +-static int +-MDAdler_Check (interp) +-Tcl_Interp* interp; +-{ +- int res; +- +- START (MDAdler_Check); +- +- res = TrfLoadZlib (interp); +- +- PRINT ("res = %d\n", res); +- DONE (MDAdler_Check); +- return res; +-} +- +--- generic/crc_zlib.c Wed Aug 9 15:13:17 2000 ++++ generic/crc_zlib.c Fri Feb 15 15:11:49 2002 +@@ -63,5 +63,5 @@ + MDcrcz_UpdateBuf, + MDcrcz_Final, +- MDcrcz_Check ++ NULL + }; + +@@ -217,28 +217,2 @@ + out [0] = (char) ((crc >> 0) & 0xff); + } +- +-/* +- *------------------------------------------------------* +- * +- * MDcrcz_Check -- +- * +- * ------------------------------------------------* +- * Check for existence of libz, load it. +- * ------------------------------------------------* +- * +- * Sideeffects: +- * As of the called procedure. +- * +- * Result: +- * None. +- * +- *------------------------------------------------------* +- */ +- +-static int +-MDcrcz_Check (interp) +-Tcl_Interp* interp; +-{ +- return TrfLoadZlib (interp); +-} +- +--- generic/zip_opt.c Sat Nov 18 17:42:32 2000 ++++ generic/zip_opt.c Fri Feb 15 15:13:22 2002 +@@ -183,13 +183,4 @@ + + /* +- * 'zip' is used, therefore load the required library. +- * And bail out if it is not available. +- */ +- +- if (TCL_OK != TrfLoadZlib (interp)) { +- return TCL_ERROR; +- } +- +- /* + * Now perform the real option check. + */ Property changes on: head/devel/tcl-trf/files/patch-zlib ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property