pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk No USE_BUILDLINK2 package sets USE_FORTRAN any long...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c114697e4c4
branches:  trunk
changeset: 475211:5c114697e4c4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 12 13:23:08 2004 +0000

description:
No USE_BUILDLINK2 package sets USE_FORTRAN any longer -- convert support
to bl3 and remove f2c's buildlink2.mk file.

diffstat:

 lang/f2c/buildlink2.mk |  37 -------------------------------------
 mk/bsd.pkg.mk          |   6 +++---
 2 files changed, 3 insertions(+), 40 deletions(-)

diffs (61 lines):

diff -r b7b59d58800f -r 5c114697e4c4 lang/f2c/buildlink2.mk
--- a/lang/f2c/buildlink2.mk    Wed May 12 09:59:19 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/08 04:03:15 jlam Exp $
-
-.if !defined(F2C_BUILDLINK2_MK)
-F2C_BUILDLINK2_MK=     # defined
-
-BUILDLINK_PACKAGES+=           f2c
-BUILDLINK_DEPENDS.f2c?=                f2c>=20001205nb3
-BUILDLINK_PKGSRCDIR.f2c?=      ../../lang/f2c
-
-EVAL_PREFIX+=          BUILDLINK_PREFIX.f2c=f2c
-BUILDLINK_PREFIX.f2c_DEFAULT=  ${LOCALBASE}
-BUILDLINK_FILES.f2c=   include/f2c.h
-BUILDLINK_FILES.f2c+=  lib/libf2c.*
-BUILDLINK_FILES.f2c+=  lib/libf2c_p.a
-BUILDLINK_FILES.f2c+=  lib/libf2c_pic.a
-BUILDLINK_FILES.f2c+=  lib/libF77.*
-BUILDLINK_FILES.f2c+=  lib/libF77_p.a
-BUILDLINK_FILES.f2c+=  lib/libF77_pic.a
-BUILDLINK_FILES.f2c+=  lib/libI77.*
-BUILDLINK_FILES.f2c+=  lib/libI77_p.a
-BUILDLINK_FILES.f2c+=  lib/libI77_pic.a
-
-BUILDLINK_TARGETS+=    f2c-buildlink
-
-PKG_FC=                        ${BUILDLINK_PREFIX.f2c}/bin/f2c-f77
-
-# The f2c-f77 script takes some environment variables to override hardcoded
-# values for the compiler and C preprocessor.
-#
-CONFIGURE_ENV+=                CC_f2c="${CC}"
-CONFIGURE_ENV+=                CPP="${CPP}"
-MAKE_ENV+=             CC_f2c="${CC}"
-MAKE_ENV+=             CPP="${CPP}"
-
-f2c-buildlink: _BUILDLINK_USE
-
-.endif # F2C_BUILDLINK2_MK
diff -r b7b59d58800f -r 5c114697e4c4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed May 12 09:59:19 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed May 12 13:23:08 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1458 2004/05/12 01:37:42 jschauma Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1459 2004/05/12 13:23:08 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -339,8 +339,8 @@
 .  if  (${PKG_FC} == "f2c-f77")
 # this is a DEPENDS not BUILD_DEPENDS because of the
 # shared Fortran libs
-.    if empty(USE_BUILDLINK2:M[nN][oO])
-.      include "../../lang/f2c/buildlink2.mk"
+.    if empty(USE_BUILDLINK3:M[nN][oO])
+.      include "../../lang/f2c/buildlink3.mk"
 .    else
 DEPENDS+=      f2c>=20001205nb3:../../lang/f2c
 .    endif



Home | Main Index | Thread Index | Old Index