From 9d1c3cbfcf48be7d0d4f22f92a38c0131985b62e Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 9 Mar 2001 13:01:35 +0000 Subject: * Found a new mastersite for the patches. Also found more patches there. * Fix the build problem that was created when bsd.port.mk started setting CXXFLAGS in MAKE_ENV. The problem is if a port uses a BSD-style Makefile and C++, sys.mk will not craft a proper CXXFLAGS because it uses "=?". --- devel/libg++/Makefile | 11 +++++------ devel/libg++/distinfo | 3 +++ devel/libg++/files/Makefile.libg++ | 3 +++ 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'devel/libg++') diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index d1c08bf6586..22a64e0ccf1 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -16,10 +16,11 @@ MASTER_SITES= http://www.m-hollstein.de/libgxx/ \ ftp://ftp.ninemoons.com/pub/mirrors/egcs/infrastructure/ \ ${MASTER_SITE_GNU} -PATCH_SITES= http://www.m-hollstein.de/libgxx/ \ - ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= obrien -PATCHFILES= ${DISTNAME}-20000312.diff.gz +PATCH_SITES= http://www.cygnus.com/~manfredh/libgxx/ \ +PATCHFILES= ${DISTNAME}-20000312.diff.gz \ + ${DISTNAME}-20000419.diff.gz \ + ${DISTNAME}-20000816.diff.gz \ + ${DISTNAME}-20000914.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= obrien@FreeBSD.org @@ -28,8 +29,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} PLIST_SUB= GCC28SUBDIR=${GCC28DIR} USE_NEWGCC= yes -BROKEN= "Does not build - compiler error" - pre-configure: @${CP} -p ${FILESDIR}/Makefile.libg++ ${WRKSRC}/Makefile diff --git a/devel/libg++/distinfo b/devel/libg++/distinfo index 5f1ec9d5d98..5fc7e447528 100644 --- a/devel/libg++/distinfo +++ b/devel/libg++/distinfo @@ -1,2 +1,5 @@ MD5 (libg++-2.8.1.3.tar.gz) = 2826dbbd081646c459b1774145ffd7bf MD5 (libg++-2.8.1.3-20000312.diff.gz) = 906124171f15ee1585d840ed7d174009 +MD5 (libg++-2.8.1.3-20000419.diff.gz) = 47b93312badd9550ccb7d113bbf0242a +MD5 (libg++-2.8.1.3-20000816.diff.gz) = 9e00e62b8fb7af3e41364b7c6d9f4cf8 +MD5 (libg++-2.8.1.3-20000914.diff.gz) = 625dd5a953661b901c876f92c2c5e7a6 diff --git a/devel/libg++/files/Makefile.libg++ b/devel/libg++/files/Makefile.libg++ index e9be473bc56..df5d0739119 100644 --- a/devel/libg++/files/Makefile.libg++ +++ b/devel/libg++/files/Makefile.libg++ @@ -11,6 +11,9 @@ DESTDIR= ${PREFIX} LIBDIR= /lib CFLAGS+= -I./libg++/src -I./librx -I/usr/include/g++ +# work around a nasty interaction between bsd.port.mk which prevents +# sys.mk from crafting a proper CXXFLAGS +CXXFLAGS+= ${CFLAGS} # This Makefile was created extracting the libstdc++-2.8.1.1 distribution # and then extracting the libg++-2.8.1.3 distribution w/in that. -- cgit