Attachment 94267 Details for Bug 132381 – file.diff

[patch] file.diff

file.diff (text/plain), 2.48 KB, created by Scot Hetzel on 2009-03-07 07:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scot Hetzel

Created: 2009-03-07 07:40:04 UTC

Size: 2.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/sqlite2/Makefile,v
>retrieving revision 1.42
>diff -u -r1.42 Makefile
>--- Makefile	21 Aug 2008 06:16:31 -0000	1.42
>+++ Makefile	7 Mar 2009 04:52:50 -0000
>@@ -29,44 +29,25 @@
> 
> EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude CVS
> 
>-OPTIONS=	TCL84	"Enable TCL wrapper (tcl 8.4)"	off \
>-		TCL83	"Enable TCL wrapper (tcl 8.3)"	off \
>+OPTIONS=	TCL	"Enable TCL wrapper"	off \
> 		THREADS	"Compile with threads support"	off \
> 		DOCS	"Building docs (depends on TCL)"	on
> 
>-# Defaults, for building the docs:
>-TCL_VERSION=	8.4
>-
> .include <bsd.port.pre.mk>
> 
> # Deprecated options
>-.if defined(SQLITE_WITH_TCL83)
>-WITH_TCL83=	yes
>-.endif
>-.if defined(SQLITE_WITH_TCL84)
>-WITH_TCL84=	yes
>-.endif
>-
>-.if defined(WITH_TCL83)
>-.if defined(WITH_TCL84)
>-BROKEN=		please, select only one TCL wrapper
>-.endif
>-CATEGORIES+=	tcl
>-TCL_VERSION=	8.3
>-WITH_TCL=	YES
>-.endif
>-
>-.if defined(WITH_TCL84)
>-.if defined(WITH_TCL83)
>-BROKEN=		please, select only one TCL wrapper
>-.endif
>-CATEGORIES+=	tcl
>-TCL_VERSION=	8.4
>-WITH_TCL=	YES
>+.if defined(SQLITE_WITH_TCL83) || defined(WITH_TCL83)
>+WITH_TCL_VER=	83
>+WITH_TCL=	yes
>+.endif
>+.if defined(SQLITE_WITH_TCL84) || defined(WITH_TCL84)
>+WITH_TCL_VER=	84
>+WITH_TCL=	yes
> .endif
> 
> .if defined(WITH_TCL)
>-LIB_DEPENDS+=	tcl${TCL_VERSION:S/.//}:${PORTSDIR}/lang/tcl${TCL_VERSION:S/.//}
>+CATEGORIES+=	tcl
>+USE_TCL=	83+
> PLIST_SUB+=	WITH_TCL=""
> .else
> PLIST_SUB+=	WITH_TCL="@comment "
>@@ -74,17 +55,21 @@
> 
> .if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
> PORTDOCS=	*
>-BUILD_DEPENDS+=	tclsh${TCL_VERSION}:${PORTSDIR}/lang/tcl${TCL_VERSION:S/.//}
>-MAKE_ARGS+=	TCLSH=tclsh${TCL_VERSION}
>-MAKE_ENV+=	TCL_VER=${TCL_VERSION}
>+USE_TCL_BUILD=	83+
>+MAKE_ARGS+=	TCLSH=${TCLSH}
>+MAKE_ENV+=	TCL_VER=${TCL_VER}
>+.endif
>+
>+.if defined(WITH_TCL) || defined(WITH_DOCS)
>+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
> 		 -e "s|\./libtool|${LIBTOOL}|g" ${WRKSRC}/Makefile.in
>-	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_VERSION}\"" \
>+	@${ECHO} "config_TARGET_TCL_INC=\"-I${TCL_INCLUDEDIR}\"" \
> 		> ${WRKSRC}/freebsd.hints
>-	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_VERSION:S/.//}\"" \
>+	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_VER:S/.//}\"" \
> 		>> ${WRKSRC}/freebsd.hints
> .if defined(WITH_THREADS)
> 	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 ${PTHREAD_LIBS}\"" \

Actions: View | Diff

Attachments on bug 132381: 94267