Attachment 59847 Details for Bug 89999 – file.diff

[patch] file.diff

file.diff (text/plain), 1.93 KB, created by Thierry Thomas on 2005-12-05 22:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2005-12-05 22:30:09 UTC

Size: 1.93 KB

patch

obsolete

>--- Mk/bsd.port.mk.orig	Wed Nov  9 20:41:24 2005
>+++ Mk/bsd.port.mk	Mon Dec  5 22:52:06 2005
>@@ -379,7 +379,6 @@
> # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
> #				  (libtool, autoconf, autoheader, automake et al.)
> #				  See bsd.autotools.mk for more details.
>-#				  XXX: not currently in active use - this is a placeholder.
> ##
> # USE_JAVA		- If set, this port relies on the Java language.
> #				  Implies inclusion of bsd.java.mk.  (Also see
>@@ -1307,10 +1306,6 @@
> PERL=		${LOCALBASE}/bin/perl
> .endif
> 
>-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
>-# .include "${PORTSDIR}/Mk/bsd.autotools.mk"
>-# XXX: (not yet): .endif
>-
> .if defined(USE_OPENSSL)
> .include "${PORTSDIR}/Mk/bsd.openssl.mk"
> .endif
>@@ -1729,13 +1724,9 @@
> .endif
> .endif
> 
>-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
>-.include "${PORTSDIR}/Mk/bsd.autotools.mk"
>-# XXX: (not yet): .endif
>-
> .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
> 	defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
>-	defined(USE_BDB) || defined(USE_SQLITE) 
>+	defined(USE_BDB) || defined(USE_SQLITE)
> .include "${PORTSDIR}/Mk/bsd.database.mk"
> .endif
> 
>@@ -1763,6 +1754,10 @@
> .include "${PORTSDIR}/Mk/bsd.apache.mk"
> .endif
> 
>+# XXX: (not yet): .if defined(USE_AUTOTOOLS)
>+.include "${PORTSDIR}/Mk/bsd.autotools.mk"
>+# XXX: (not yet): .endif
>+
> .if exists(${PORTSDIR}/../Makefile.inc)
> .include "${PORTSDIR}/../Makefile.inc"
> USE_SUBMAKE=	yes
>@@ -3691,8 +3686,8 @@
> 				do-patch post-patch post-patch-script
> _CONFIGURE_DEP=	patch
> _CONFIGURE_SEQ=	build-depends lib-depends misc-depends configure-message \
>-		pre-configure pre-configure-script patch-autotools \
>-		run-autotools do-configure post-configure post-configure-script
>+				pre-configure pre-configure-script run-autotools \
>+				do-configure post-configure post-configure-script
> _BUILD_DEP=		configure
> _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
> 				post-build post-build-script
>--- bsd.port.mk.diff ends here ---

Actions: View | Diff

Attachments on bug 89999: 59846 | 59847