Attachment 95802 Details for Bug 134274 – file.diff

[patch] file.diff

file.diff (text/plain), 8.64 KB, created by M. L. Dodson on 2009-05-06 16:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: M. L. Dodson

Created: 2009-05-06 16:10:01 UTC

Size: 8.64 KB

patch

obsolete

>diff -ruN g95-bak/Makefile g95/Makefile
>--- g95/Makefile.orig	2008-08-21 01:17:29.000000000 -0500
>+++ g95/Makefile	2009-05-04 15:16:37.000000000 -0500
>@@ -8,20 +8,18 @@
> PORTNAME=	g95
> PORTVERSION=	${G95VERSION}.${SNAPDATE}
> CATEGORIES=	lang
>-MASTER_SITES=	http://ftp.g95.org/v0.9/:g95 \
>-		${MASTER_SITE_LOCAL}:g95 \
>+MASTER_SITES=	http://www.activesitedynamics.com/ \
> 		${MASTER_SITE_GCC:S/$/:gcc/}
>-MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VER}/:gcc \
>-			maho/g95/:g95
>-DISTFILES=	${PORTNAME}_source.tgz:g95 \
>+MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VER}/:gcc
>+DISTFILES=	${PORTNAME}_source.tgz \
> 		gcc-core-${GCC_VER}${EXTRACT_SUFX}:gcc
> DIST_SUBDIR=	g95/${SNAPDATE}
> 
>-MAINTAINER=	mldodson@comcast.net
>+MAINTAINER=	ports@freebsd.org
> COMMENT=	Fortran 95 compiler from g95.org
> 
>-SNAPDATE=	20070129
>-G95VERSION=	0.91
>+SNAPDATE=	20090502
>+G95VERSION=	0.92
> WRKSRC=		${WRKDIR}/${PORTNAME}-${G95VERSION}
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>diff -ruN g95-bak/distinfo g95/distinfo
>--- g95/distinfo.orig	2007-01-29 19:03:17.000000000 -0600
>+++ g95/distinfo	2009-05-04 13:52:14.000000000 -0500
>@@ -1,6 +1,6 @@
>-MD5 (g95/20070129/g95_source.tgz) = 94a7d1d00563be8e89aa165175e77256
>-SHA256 (g95/20070129/g95_source.tgz) = b63ccbe9ae4c8f40f897c253792de7f440e47fdb14290e906b6c962b6c0c8e74
>-SIZE (g95/20070129/g95_source.tgz) = 1319217
>-MD5 (g95/20070129/gcc-core-4.0.3.tar.gz) = 090c507c9807e70b8404799a6fc570eb
>-SHA256 (g95/20070129/gcc-core-4.0.3.tar.gz) = 5f320b2d271af1084ec298cbde2256c5e7e7f7019adc2c52d2ff8593ac64a65f
>-SIZE (g95/20070129/gcc-core-4.0.3.tar.gz) = 20137297
>+MD5 (g95/20090502/g95_source.tgz) = d0e4d124bc7e1d075b74e18b579a10e9
>+SHA256 (g95/20090502/g95_source.tgz) = 46602e15249d31486f2c4036ac52f8b6c09c0040121f76e8e96e3d0fac4f87bd
>+SIZE (g95/20090502/g95_source.tgz) = 1352400
>+MD5 (g95/20090502/gcc-core-4.0.3.tar.gz) = 090c507c9807e70b8404799a6fc570eb
>+SHA256 (g95/20090502/gcc-core-4.0.3.tar.gz) = 5f320b2d271af1084ec298cbde2256c5e7e7f7019adc2c52d2ff8593ac64a65f
>+SIZE (g95/20090502/gcc-core-4.0.3.tar.gz) = 20137297
>diff -ruN g95-bak/files/patch-Makefile.in g95/files/patch-Makefile.in
>--- g95/files/patch-Makefile.in.orig	2007-01-29 19:03:17.000000000 -0600
>+++ g95/files/patch-Makefile.in	2009-05-04 13:58:46.000000000 -0500
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	Wed Jul 12 02:20:14 2006
>-+++ Makefile.in	Sat Jan 20 20:42:53 2007
>-@@ -57,6 +57,7 @@
>+--- Makefile.in.orig	2009-02-17 10:46:06.000000000 -0600
>++++ Makefile.in	2009-05-04 13:58:03.000000000 -0500
>+@@ -170,6 +170,7 @@
>  DEFS = @DEFS@
>  DEPDIR = @DEPDIR@
>  DEST_LIBDIR = @DEST_LIBDIR@
>@@ -8,9 +8,9 @@
>  ECHO_C = @ECHO_C@
>  ECHO_N = @ECHO_N@
>  ECHO_T = @ECHO_T@
>-@@ -167,16 +168,16 @@
>- 
>+@@ -284,16 +285,16 @@
>  
>+ @GCC_TRUE@g95_SOURCES = g95spec.c
>  @GCC_TRUE@g95_CFLAGS = -DTARGET_NAME=\"@host@\"					\
> -@GCC_TRUE@	     -DSTANDARD_EXEC_PREFIX=\"@DEST_LIBDIR@\"			\
> +@GCC_TRUE@	     -DSTANDARD_EXEC_PREFIX=\"@DEST_LIBDIR@/\"			\
>@@ -29,26 +29,26 @@
>  @GCC_TRUE@	     -DG95_SPEC=\"@G95_SPEC@\"                              \
>  @GCC_TRUE@             @G95_CFLAGS@
>  
>-@@ -395,6 +396,9 @@
>+@@ -364,6 +365,9 @@
>  install-binPROGRAMS: $(bin_PROGRAMS)
>  	@$(NORMAL_INSTALL)
>- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
>+ 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
> +	if test "X@DEST_DOCDIR@" != "X"; then \
> +	  $(mkinstalldirs) @DEST_DOCDIR@ ; \
> +	fi
>  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
>  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
>  	  if test -f $$p \
>-@@ -2659,8 +2663,10 @@
>- 	  ranlib @DEST_LIBDIR@/libgcc_eh.a ; \
>- 	  ranlib @DEST_LIBDIR@/libgcc.a ; \
>+@@ -1341,8 +1345,10 @@
>+ 	  ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc_eh.a ; \
>+ 	  ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc.a ; \
>  	fi
>--	cp INSTALL @DEST_LIBDIR@/../../../..
>--	cp G95Manual.pdf @DEST_LIBDIR@/../../../..
>+-	cp INSTALL $(DESTDIR)@DEST_LIBDIR@/../../../..
>+-	cp G95Manual.pdf $(DESTDIR)@DEST_LIBDIR@/../../../..
> +	if test "X@DEST_DOCDIR@" != "X"; then \
> +	  $(INSTALL_DATA) INSTALL @DEST_DOCDIR@ ; \
> +	  $(INSTALL_DATA) G95Manual.pdf @DEST_DOCDIR@ ; \
> +	fi
>  	if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_s.*`" ; then \
>  	   (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_s.*) | \
>-            (cd @DEST_LIBDIR@; tar xf -) ; \
>+            (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \
>diff -ruN g95-bak/files/patch-configure g95/files/patch-configure
>--- g95/files/patch-configure.orig	2007-01-29 19:03:17.000000000 -0600
>+++ g95/files/patch-configure	2009-05-04 14:06:50.000000000 -0500
>@@ -1,27 +1,128 @@
>---- configure.orig	Tue Jan  9 16:28:10 2007
>-+++ configure	Tue Jan 30 09:38:36 2007
>-@@ -308,7 +308,7 @@
>+--- configure.orig	2008-08-19 20:05:52.000000000 -0500
>++++ configure	2009-05-04 14:05:43.000000000 -0500
>+@@ -613,115 +613,8 @@
>  # include <unistd.h>
>  #endif"
>  
>--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ALLOCA GCC_DIR DEST_LIBDIR PREFIX EXTRA_OPTS PARTS LDADD0 GCC_TRUE GCC_FALSE GCC41_TRUE GCC41_FALSE TARGET_SYSTEM_ROOT DEFAULT_TARGET_VERSION DEFAULT_TARGET_MACHINE G95_SPEC G95_CFLAGS COMMON_LDFLAGS G95_WORD L
> INK_SPEC STARTFILE_PREFIX_2 LIBOBJS LTLIBOBJS'
>+-ac_subst_vars='SHELL
>+-PATH_SEPARATOR
>+-PACKAGE_NAME
>+-PACKAGE_TARNAME
>+-PACKAGE_VERSION
>+-PACKAGE_STRING
>+-PACKAGE_BUGREPORT
>+-exec_prefix
>+-prefix
>+-program_transform_name
>+-bindir
>+-sbindir
>+-libexecdir
>+-datarootdir
>+-datadir
>+-sysconfdir
>+-sharedstatedir
>+-localstatedir
>+-includedir
>+-oldincludedir
>+-docdir
>+-infodir
>+-htmldir
>+-dvidir
>+-pdfdir
>+-psdir
>+-libdir
>+-localedir
>+-mandir
>+-DEFS
>+-ECHO_C
>+-ECHO_N
>+-ECHO_T
>+-LIBS
>+-build_alias
>+-host_alias
>+-target_alias
>+-INSTALL_PROGRAM
>+-INSTALL_SCRIPT
>+-INSTALL_DATA
>+-am__isrc
>+-CYGPATH_W
>+-PACKAGE
>+-VERSION
>+-ACLOCAL
>+-AUTOCONF
>+-AUTOMAKE
>+-AUTOHEADER
>+-MAKEINFO
>+-install_sh
>+-STRIP
>+-INSTALL_STRIP_PROGRAM
>+-mkdir_p
>+-AWK
>+-SET_MAKE
>+-am__leading_dot
>+-AMTAR
>+-am__tar
>+-am__untar
>+-CC
>+-CFLAGS
>+-LDFLAGS
>+-CPPFLAGS
>+-ac_ct_CC
>+-EXEEXT
>+-OBJEXT
>+-DEPDIR
>+-am__include
>+-am__quote
>+-AMDEP_TRUE
>+-AMDEP_FALSE
>+-AMDEPBACKSLASH
>+-CCDEPMODE
>+-am__fastdepCC_TRUE
>+-am__fastdepCC_FALSE
>+-CPP
>+-build
>+-build_cpu
>+-build_vendor
>+-build_os
>+-host
>+-host_cpu
>+-host_vendor
>+-host_os
>+-GREP
>+-EGREP
>+-ALLOCA
>+-GCC_DIR
>+-DEST_LIBDIR
>+-PREFIX
>+-EXTRA_OPTS
>+-PARTS
>+-LDADD0
>+-GCC_TRUE
>+-GCC_FALSE
>+-GCC41_TRUE
>+-GCC41_FALSE
>+-TARGET_SYSTEM_ROOT
>+-DEFAULT_TARGET_VERSION
>+-DEFAULT_TARGET_MACHINE
>+-G95_SPEC
>+-G95_CFLAGS
>+-COMMON_LDFLAGS
>+-G95_WORD
>+-LINK_SPEC
>+-STARTFILE_PREFIX_2
>+-LIBOBJS
>+-LTLIBOBJS'
>+-ac_subst_files=''
> +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ALLOCA GCC_DIR DEST_DOCDIR DEST_LIBDIR PREFIX EXTRA_OPTS PARTS LDADD0 GCC_TRUE GCC_FALSE GCC41_TRUE GCC41_FALSE TARGET_SYSTEM_ROOT DEFAULT_TARGET_VERSION DEFAULT_TARGET_MACHINE G95_SPEC G95_CFLAGS COMMON_LDFLAG
> S G95_WORD LINK_SPEC STARTFILE_PREFIX_2 LIBOBJS LTLIBOBJS'
>- ac_subst_files=''
>- 
>- # Initialize some variables set by options.
>-@@ -3994,6 +3994,7 @@
>- echo "${ECHO_T}$gcc_version" >&6
>++  ac_subst_files=''
>+       ac_precious_vars='build_alias
>+ host_alias
>+ target_alias
>+@@ -4877,6 +4770,7 @@
>+ echo "${ECHO_T}$gcc_version" >&6; }
>  
>     DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
> +   DEST_DOCDIR=${DOCSDIR}
>     SAVE_DIR=`pwd`
>     PREFIX=$prefix
>  
>-@@ -6354,6 +6355,7 @@
>- s,@ALLOCA@,$ALLOCA,;t t
>- s,@GCC_DIR@,$GCC_DIR,;t t
>- s,@DEST_LIBDIR@,$DEST_LIBDIR,;t t
>-+s,@DEST_DOCDIR@,$DEST_DOCDIR,;t t
>- s,@PREFIX@,$PREFIX,;t t
>- s,@EXTRA_OPTS@,$EXTRA_OPTS,;t t
>- s,@PARTS@,$PARTS,;t t

Actions: View | Diff

Attachments on bug 134274: 95802