Fix --tag errors associated with building with the latest libtool.

3 files changed, 36 insertions, 35 deletions

diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index c19b420bc53..33f883ca2fd 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/26 20:00:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/30 20:41:11 jlam Exp $
 
 DISTNAME=	STLport-4.0
 PKGNAME=	stlport-4.0
@@ -9,7 +9,7 @@ MAINTAINER=	p99dreyf@criens.u-psud.fr
 HOMEPAGE=	http://www.stlport.org/
 COMMENT=	Complete C++ standard library
 
-DEPENDS+=	{gcc,pgcc}-${GCC_VERS}*:../../lang/gcc
+DEPENDS+=	{gcc,pgcc}>=${GCC_VERS}:../../lang/gcc
 GCC_VERS=	2.95.2
 
 USE_GMAKE=	# defined
@@ -17,9 +17,8 @@ USE_LIBTOOL=	# defined
 
 NO_CONFIGURE=	# defined
 
-MAKE_ENV+=	CC="${GCC_BINDIR}/gcc"
-MAKE_ENV+=	CPP="${GCC_BINDIR}/cpp"
-MAKE_ENV+=	CXX="${GCC_BINDIR}/c++"
+MAKE_ENV+=	CC="--tag CC ${GCC_BINDIR}/cc"
+MAKE_ENV+=	CXX="--tag CXX ${GCC_BINDIR}/c++"
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 MAKEFILE=	gcc-libtool.mak
@@ -43,11 +42,11 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCDIR}
 	${CHMOD} -R ${SHAREMODE} ${INCDIR}
 	${CHMOD} -R a+X ${INCDIR}
-	for lib in \
-		libstlport_gcc.la \
-		libstlport_gcc_debug.la \
-		libstlport_gcc_stldebug.la; \
-	do \
+	for lib in							\
+		libstlport_gcc.la					\
+		libstlport_gcc_debug.la					\
+		libstlport_gcc_stldebug.la;				\
+	do								\
 		${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/$${lib} ${LIBDIR}; \
 	done
 	${INSTALL_DATA_DIR} ${HTMLDIR}
diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 3cc36084a86..ee9e3efebd0 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:47 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/04/30 20:41:11 jlam Exp $
 
 SHA1 (STLport-4.0.tar.gz) = 2b13928768d2e9320f5f6f9dd4718e2ac842b637
 Size (STLport-4.0.tar.gz) = 695790 bytes
-SHA1 (patch-aa) = e47888b8ea58080f1f2be2137dadd20bf74ea33c
+SHA1 (patch-aa) = 7d81540306084a02bf34ed095a6906781d0c44b7
 SHA1 (patch-ab) = 03e790d6c4a666e2929b1fe127be11df9eb97092
 SHA1 (patch-ac) = 889b64fe621d4c1f9e1ab9e0744a9b2daa6cad27
 SHA1 (patch-ad) = fc016c373fcb839c7fe3a7812e7a8d17d290c40a
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index b61c006daf4..cf80152171a 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/30 20:41:12 jlam Exp $
 
---- src/gcc-libtool.mak.orig	Wed Dec 27 01:44:48 2000
+--- src/gcc-libtool.mak.orig	Mon Apr 30 15:26:47 2001
 +++ src/gcc-libtool.mak
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,80 @@
 +#
 +# Note : this makefile is for gcc-2.95 and later !
 +#
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
 +# guts for common stuff
 +#
 +#
-+LINK=${LIBTOOL} c++ -rpath ${PREFIX}/lib -version-info 0:0 -o
++LINK=$(LIBTOOL) $(CXX) -rpath $(PREFIX)/lib -version-info 0:0 -o
 +
 +OBJEXT=lo
 +STEXT=la
@@ -38,9 +38,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
 +
 +include common_macros.mak
 +
++SRCDIR = ../../..
++
 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
 +
-+CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} -I${STLPORT_DIR} ${WARNING_FLAGS}
++CXXFLAGS_COMMON = ${CXXFLAGS} ${CPPFLAGS} -I${SRCDIR} -I${SRCDIR}/${STLPORT_DIR} ${WARNING_FLAGS}
 +
 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
 +
@@ -53,31 +55,31 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/27 17:37:51 jlam Exp $
 +.SUFFIXES: .cpp .c .o .lo .so .a
 +
 +$(RELEASE_OBJDIR_static)/%.lo: %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -c $< && \
-+		$(MV) $(<:.cpp=.lo) $(<:.cpp=.o) $(RELEASE_OBJDIR_static)
++	cd $(RELEASE_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -c $(SRCDIR)/$<
 +$(RELEASE_OBJDIR_static)/%.lo: %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_static) -c $< && \
-+		$(MV) $(<:.c=.lo) $(<:.c=.o) $(RELEASE_OBJDIR_static)
++	cd $(RELEASE_OBJDIR_static) && \
++		$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_static) -c $(SRCDIR)/$<
 +$(RELEASE_OBJDIR_static)/%.i : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -E $< && \
-+		$(MV) $@ $(RELEASE_OBJDIR_static)
++	cd $(RELEASE_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) -E $(SRCDIR)/$<
 +
 +$(DEBUG_OBJDIR_static)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -c $< && \
-+		$(MV) $(<:.cpp=.lo) $(<:.cpp=.o) $(DEBUG_OBJDIR_static)
++	cd $(DEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -c $(SRCDIR)/$<
 +$(DEBUG_OBJDIR_static)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_static) -c $< && \
-+		$(MV) $(<:.c=.lo) $(<:.c=.o) $(DEBUG_OBJDIR_static)
++	cd $(DEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_static) -c $(SRCDIR)/$<
 +$(DEBUG_OBJDIR_static)/%.i : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -E $< && \
-+		$(MV) $@ $(DEBUG_OBJDIR_static)
++	cd $(DEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) -E $(SRCDIR)/$<
 +
 +$(STLDEBUG_OBJDIR_static)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -c $< && \
-+		$(MV) $(<:.cpp=.lo) $(<:.cpp=.o) $(STLDEBUG_OBJDIR_static)
++	cd $(STLDEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -c $(SRCDIR)/$<
 +$(STLDEBUG_OBJDIR_static)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_static) -c $< && \
-+		$(MV) $(<:.c=.lo) $(<:.c=.o) $(STLDEBUG_OBJDIR_static)
++	cd $(STLDEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_static) -c $(SRCDIR)/$<
 +$(STLDEBUG_OBJDIR_static)/%.i : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -E $< && \
-+		$(MV) $@ $(STLDEBUG_OBJDIR_static)
++	cd $(STLDEBUG_OBJDIR_static) && \
++		$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) -E $(SRCDIR)/$<