Attachment 86079 Details for Bug 122454 – file.diff

[patch] file.diff

file.diff (text/plain), 5.51 KB, created by Martin Matuska on 2008-04-05 00:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2008-04-05 00:40:03 UTC

Size: 5.51 KB

patch

obsolete

>Index: ports/devel/tcltls/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/tcltls/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- ports/devel/tcltls/Makefile	11 Jun 2007 19:56:59 -0000	1.13
>+++ ports/devel/tcltls/Makefile	3 Apr 2008 07:28:36 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tcltls
>-PORTVERSION=	1.5.0
>+PORTVERSION=	1.6
> CATEGORIES=	devel tcl83 tcl84
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=tls
>@@ -15,28 +15,24 @@
> MAINTAINER=	mi@aldan.algebra.com
> COMMENT=	SSL extensions for TCL; dynamicly loadable
> 
>-LIB_DEPENDS+=	tcl${TCLVND}:${PORTSDIR}/lang/tcl${TCLVND}
>+WRKSRC=		${WRKDIR}/tls${PORTVERSION}
> 
>-MANUAL_PACKAGE_BUILD=Self-tests fail/hang
>+USE_TCL=	83+
> 
>-USE_OPENSSL=	Yes
>+USE_OPENSSL=	yes
>+GNU_CONFIGURE=	yes
> 
>-WRKSRC=	${WRKDIR}/tls${PORTVERSION:R}
>+TLS_VERSION=	${PORTVERSION}
> 
>-PLIST_SUB+=	TCL_VER=${TCL_VER} DISTNAME="${DISTNAME}"
>-MAKEFILE=	${FILESDIR}/Makefile.bsd
>-MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
>-		INSTALL_DATA="${INSTALL_DATA}" \
>-		OPENSSLINC="${OPENSSLINC}" OPENSSLLIB="${OPENSSLLIB}" \
>-		OPENSSLDIR="${OPENSSLDIR}" CFLAGS="${CFLAGS}" \
>-		SHLIB_NAME=libtls.so.1 \
>-		PORTVERSION="${PORTVERSION}" SED="${SED}"
>-REINPLACE_ARGS=	-i ""
>-ALL_TARGET=	all
>+PLIST_SUB+=	TLS_VERSION=${TLS_VERSION}
>+PORTDOCS=	ChangeLog README.txt tls.htm
>+
>+.include <bsd.port.pre.mk>
>+CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} --with-ssl-dir=${OPENSSLBASE}
> 
> post-patch:
> 	${REINPLACE_CMD} -e \
>-		's,package require tls.*,load ${WRKSRC}/libtls.so;\
>+		's,package require tls.*,load ${WRKSRC}/libtls${TLS_VERSION}.so;\
> 			source ${WRKSRC}/tls.tcl,' \
> 		${WRKSRC}/tests/*.test
> 	# The tests in ciphers.test are meaningless so far:
>@@ -44,18 +40,14 @@
> 
> .if !defined(NOPORTDOCS)
> post-install:
>-	${MKDIR} ${PREFIX}/share/doc/tls
>-	${INSTALL_DATA} ${WRKSRC}/tls.htm ${PREFIX}/share/doc/tls/
>+	${MKDIR} ${DOCSDIR}
>+. for FILE in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
>+. endfor
> .endif
> 
> post-build test:
> 	cd ${WRKSRC}/tests && env TCL_LIBRARY="${WRKSRC}" \
>-		tclsh${TCL_VER} all.tcl
>-
>-TCL_VER?=	8.4
>-TCLVND=		${TCL_VER:S/.//}
>-
>-.include <bsd.port.mk>
>+		${SETENV} TCL_LIBRARY="${WRKSRC}" ${TCLSH} all.tcl
> 
>-PLIST_SUBP!=	${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} environ
>-PLIST_SUB+=	${PLIST_SUBP}
>+.include <bsd.port.post.mk>
>Index: ports/devel/tcltls/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/tcltls/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- ports/devel/tcltls/distinfo	22 Jan 2006 08:30:06 -0000	1.6
>+++ ports/devel/tcltls/distinfo	3 Apr 2008 07:28:36 -0000
>@@ -1,3 +1,3 @@
>-MD5 (tls1.5.0-src.tar.gz) = 9eeab472475773b3810acc808ebec759
>-SHA256 (tls1.5.0-src.tar.gz) = 422ac2e4a812763a8f859b868c659d69769945ab754bd418b2eb07ce9bbcd253
>-SIZE (tls1.5.0-src.tar.gz) = 113600
>+MD5 (tls1.6-src.tar.gz) = eb326ff9e6fc3b9885aa5c72fb8df3bf
>+SHA256 (tls1.6-src.tar.gz) = adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3
>+SIZE (tls1.6-src.tar.gz) = 168043
>Index: ports/devel/tcltls/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/devel/tcltls/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- ports/devel/tcltls/pkg-plist	21 Feb 2001 22:37:37 -0000	1.2
>+++ ports/devel/tcltls/pkg-plist	3 Apr 2008 07:28:36 -0000
>@@ -1,7 +1,6 @@
>-%%SCRIPTDIR%%/pkgIndex.tcl
>-%%SCRIPTDIR%%/tls.tcl
>-@dirrm %%SCRIPTDIR%%
>-lib/%%SHLIB_NAME%%
>-lib/%%SHLIB_LINK%%
>-%%PORTDOCS%%share/doc/tls/tls.htm
>-%%PORTDOCS%%@dirrm share/doc/tls
>+include/tls.h
>+lib/tls%%TLS_VERSION%%/libtls%%TLS_VERSION%%.so
>+lib/tls%%TLS_VERSION%%/pkgIndex.tcl
>+lib/tls%%TLS_VERSION%%/tls.tcl
>+@dirrm lib/tls%%TLS_VERSION%%
>+
>Index: ports/devel/tcltls/files/Makefile.bsd
>===================================================================
>RCS file: ports/devel/tcltls/files/Makefile.bsd
>diff -N ports/devel/tcltls/files/Makefile.bsd
>--- ports/devel/tcltls/files/Makefile.bsd	4 Apr 2004 18:41:25 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-PACKAGE		= tls
>-VERSION		?= ${PORTVERSION:R}
>-.ifndef(SHLIB_NAME)
>-LIB		= ${PACKAGE}
>-SHLIB_MAJOR	= ${VERSION:R}
>-SHLIB_MINOR	= ${VERSION:E}
>-.endif
>-
>-SRCS		= tls.c tlsIO.c tlsBIO.c tlsX509.c # fixstrtod.c strncasecmp.c
>-
>-PREFIX		?=/usr/local
>-TCL_VER		?=8.3
>-
>-.if exists(${PREFIX}/lib/tcl${TCL_VER}/tclConfig.sh)
>-# If for some reason  the file does not exist -- make the best guess. In
>-# reality, it will exist by the time we are actually doing the build, so
>-# the quality of the guess does not matter. But we still try well. -mi
>-TCL_STUB_LIB_SPEC!=	. ${PREFIX}/lib/tcl${TCL_VER}/tclConfig.sh; \
>-		echo $$TCL_STUB_LIB_SPEC
>-.else
>-TCL_STUB_LIB_SPEC=	-L${PREFIX}/lib -ltclstub${TCL_VER:S/.//}
>-.endif
>-
>-LDADD		+= ${TCL_STUB_LIB_SPEC} -L${OPENSSLLIB} -lcrypto -lssl
>-
>-CFLAGS		+=-I${PREFIX}/include/tcl${TCL_VER} -I${OPENSSLINC}
>-CFLAGS		+=-DNDEBUG -I. -DUSE_TCL_STUBS -I${PREFIX}/include
>-CFLAGS		+=-DVERSION=\"${VERSION}\" -DPACKAGE=\"${PACKAGE}\"
>-
>-all: ${SHLIB_NAME} pkgIndex.tcl
>-
>-pkgIndex.tcl: ${.CURDIR}/pkgIndex.tcl.in
>-	${SED} -e "s#@RELPATH@#..#" -e "s#@tls_LIB_FILE@#${SHLIB_NAME}#" \
>-		< ${.CURDIR}/pkgIndex.tcl.in > pkgIndex.tcl
>-
>-SCRIPTDIR	= lib/tls
>-SCRIPTPATH	= ${PREFIX}/${SCRIPTDIR}
>-LIBDIR		= ${PREFIX}/lib
>-
>-${SCRIPTPATH}:
>-	${MKDIR} ${SCRIPTPATH}
>-
>-environ:
>-	@${ECHO} SHLIB_NAME="${SHLIB_NAME}" SHLIB_LINK="${SHLIB_LINK}" \
>-		SCRIPTDIR="${SCRIPTDIR}"
>-
>-beforeinstall: ${SCRIPTPATH}
>-	${INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/tls.tcl ${SCRIPTPATH}
>-
>-.include <bsd.lib.mk>

Actions: View | Diff

Attachments on bug 122454: 86079