Import of pkgsrc-2015Q1

lang/g95/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2014/02/17 16:49:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2014/07/16 12:16:31 rodent Exp $
 
 DISTNAME=	g95_source
 PKGNAME=	g95-0.93
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.g95.org/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,7 @@ GCC_CONFIGURE_SCRIPT=	../configure
 GCC_CONFIGURE_ARGS=	${CONFIGURE_ARGS}
 GCC_CONFIGURE_ARGS+=	--enable-languages=c
 GCC_CONFIGURE_ARGS+=	--disable-multilib
+GCC_CONFIGURE_ARGS+=	--disable-libssp # to build on NetBSD 6.88.43
 
 # Avoid "ld: illegal text-relocation to half in .libs/x87.o"
 LDFLAGS.Darwin+=	-Wl,-read_only_relocs,suppress
@@ -41,6 +42,8 @@ GCC_CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
 .  else
 GCC_CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
 .  endif
+.elif ${OPSYS} == "Linux"
+USE_TOOLS+=	perl:build
 .endif
 
 post-extract:

lang/g95/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2014/02/19 18:27:43 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2014/04/17 21:19:02 asau Exp $
 
 SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
 RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
@@ -10,7 +10,7 @@ SHA1 (patch-ab) = 7429a4da26aa573dcdd94bf417da1e009f95d273
 SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8
 SHA1 (patch-g95spec.c) = d6f434e715835cd39511c45ed18632c8401b78a2
 SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268
-SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959
+SHA1 (patch-gcc_config.gcc) = 77c241a77e1879cd0a73847591d39adac7b13fc3
 SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511
 SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9
 SHA1 (patch-gcc_config_freebsd-spec.h) = 8a1b78b479a386caec14e6a6333fde4a8af6de2c

lang/g95/patches/patch-gcc_config.gcc

@@ -1,11 +1,21 @@
-$NetBSD: patch-gcc_config.gcc,v 1.1 2013/05/20 05:47:34 adam Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.2 2014/04/17 21:19:02 asau Exp $
 
 Darwin 64-bit support.
 DragonFly BSD support.
+FreeBSD 10 support.
 
---- ../gcc-4.1.2/gcc/config.gcc.orig	2006-10-15 23:12:23.000000000 +0000
-+++ ../gcc-4.1.2/gcc/config.gcc
-@@ -440,6 +440,23 @@ case ${target} in
+--- ../gcc-4.1.2/gcc/config.gcc.orig	2006-10-16 01:12:23.000000000 +0200
++++ ../gcc-4.1.2/gcc/config.gcc	2014-04-17 15:05:05.084032706 +0200
+@@ -412,6 +412,8 @@
+       tm_defines="${tm_defines} FBSD_MAJOR=8" ;;
+     *-*-freebsd9 | *-*-freebsd[9].*)
+       tm_defines="${tm_defines} FBSD_MAJOR=9" ;;
++    *-*-freebsd10 | *-*-freebsd10.*)
++      tm_defines="${tm_defines} FBSD_MAJOR=10" ;;
+     *)
+       echo 'Please update *-*-freebsd* in gcc/config.gcc'
+       exit 1
+@@ -440,6 +442,23 @@
    esac
    fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
    ;;
@@ -29,7 +39,7 @@ DragonFly BSD support.
  *-*-linux*libc1* | *-*-linux*aout*)
    # Avoid the generic linux case.
    ;;
-@@ -981,6 +998,8 @@ hppa[12]*-*-hpux11*)
+@@ -981,6 +1000,8 @@
  i[34567]86-*-darwin*)
  	# All the configuration is presently done generically.
  	;;
@@ -38,7 +48,7 @@ DragonFly BSD support.
  i[34567]86-*-elf*)
  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
  	tmake_file="i386/t-i386elf t-svr4"
-@@ -1012,6 +1031,12 @@ i[34567]86-*-freebsd*)
+@@ -1012,6 +1033,12 @@
  x86_64-*-freebsd*)
  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
  	;;