Split Fortran support from devel/libtool-base into a separate package

devel/libtool-fortran. If USE_LIBTOOL is present and Fortran is in
USE_LANGUAGES, include the new package.

5 files changed, 107 insertions, 3 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 731687621ee..3c3b698dede 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1738 2013/04/29 07:43:49 adam Exp $
+# $NetBSD: Makefile,v 1.1739 2013/05/09 13:53:47 joerg Exp $
 #
 
 COMMENT=	Development utilities
@@ -415,6 +415,7 @@ SUBDIR+=	libthai
 SUBDIR+=	libthrift
 SUBDIR+=	libtool
 SUBDIR+=	libtool-base
+SUBDIR+=	libtool-fortran
 SUBDIR+=	libtool-info
 SUBDIR+=	libts
 SUBDIR+=	libusb
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 84334f6cbaf..29f5c6fec86 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2013/04/12 13:44:08 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2013/05/09 13:53:47 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,6 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
+PKGREVISION=	1
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
@@ -57,7 +58,7 @@ CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
 #
-USE_LANGUAGES=		c c++ fortran77
+USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--disable-ltdl-install
 
 USE_TOOLS+=		echo
diff --git a/devel/libtool-fortran/DESCR b/devel/libtool-fortran/DESCR
new file mode 100644
index 00000000000..f11b4e73ee2
--- /dev/null
+++ b/devel/libtool-fortran/DESCR
@@ -0,0 +1,8 @@
+This is GNU Libtool, a generic library support script.  Libtool hides
+the complexity of using shared libraries behind a consistent, portable
+interface.
+
+To use libtool, add the new generic library building commands to your
+Makefile, Makefile.in, or Makefile.am.
+
+This package includes the libtool script with Fortran support.
diff --git a/devel/libtool-fortran/Makefile b/devel/libtool-fortran/Makefile
new file mode 100644
index 00000000000..856dcca19c3
--- /dev/null
+++ b/devel/libtool-fortran/Makefile
@@ -0,0 +1,91 @@
+# $NetBSD: Makefile,v 1.1 2013/05/09 13:53:48 joerg Exp $
+
+###########################################################################
+###########################################################################
+#
+# HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
+###########################################################################
+###########################################################################
+#
+# This package is maintained specially in order to preserve pkgsrc
+# specific OS changes that diverge from the "out of the box" libtool.
+# In order to keep this package in a maintainable condition, the .m4 files
+# must be manipulated in order to generate the patch-* files.
+#
+# See devel/libtool/patches/manual.README for instructions on how to make
+# these patch files properly; otherwise your changes WILL be lost on the
+# next libtool update.
+#
+# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
+# INSTRUCTIONS.  There are no exceptions to this rule.
+#
+###########################################################################
+###########################################################################
+
+.include "../../devel/libtool/Makefile.common"
+
+FILESDIR=	${.CURDIR}/../libtool-base/files
+
+PKGNAME=	${DISTNAME:S/-/-fortran-/}
+SVR4_PKGNAME=	ltoob
+
+COMMENT=	Generic shared library support script (the script itself, incl. Fortran)
+
+CONFLICTS+=	libtool<=1.3.5nb11
+
+TEST_TARGET=	check
+
+OVERRIDE_DIRDEPTH.install-sh=	1
+
+.if ${OPSYS} == "AIX"
+
+# always build libraries and executables that use the runtime linker.
+# in addition, disable libtool locking, as the test is broken on AIX,
+# and results in files being locked indefinitely.
+LDFLAGS+=		-Wl,-brtl
+CONFIGURE_ARGS+=	--disable-libtool-lock
+
+.elif ${OPSYS} == "IRIX"
+
+# The MIPSpro compiler doesn't support -c with -o, but the locking
+# workaround is itself broken.  Disable it unconditionally.
+CONFIGURE_ARGS+=	--disable-libtool-lock
+
+.elif ${OPSYS} == "SunOS"
+CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
+.endif
+
+# We are going to want libtool to find the same versions of the C, C++,
+# and Fortran compilers.
+#
+USE_LANGUAGES=		c c++ fortran
+CONFIGURE_ARGS+=	--disable-ltdl-install
+
+USE_TOOLS+=		echo
+
+INSTALLATION_DIRS+=	bin
+
+.PHONY: fix-libtool
+fix-libtool:
+	cd ${WRKSRC}; for f in libtool; do				\
+		${SED}	-e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new;	\
+		if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi;		\
+		${MV} -f $$f.new $$f;					\
+	done
+
+post-build: fix-libtool
+
+post-build:
+	@${SED}	-e "s|@PREFIX@|"${PREFIX:Q}"|g"				\
+		-e "s|@SH@|"${SH:Q}"|g"					\
+		${FILESDIR}/shlibtool-fortran.in > ${WRKSRC}/shlibtool-fortran
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/shlibtool-fortran ${DESTDIR}${PREFIX}/bin/shlibtool-fortran
+	${INSTALL_SCRIPT} ${WRKSRC}/libtool ${DESTDIR}${PREFIX}/bin/libtool-fortran
+
+BUILDLINK_DEPMETHOD.dlcompat=	build
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool-fortran/PLIST b/devel/libtool-fortran/PLIST
new file mode 100644
index 00000000000..31e40a2e7b7
--- /dev/null
+++ b/devel/libtool-fortran/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/05/09 13:53:48 joerg Exp $
+bin/libtool-fortran
+bin/shlibtool-fortran