diff options
| author | trevor <trevor@FreeBSD.org> | 2002-01-25 14:24:44 +0000 |
|---|---|---|
| committer | trevor <trevor@FreeBSD.org> | 2002-01-25 14:24:44 +0000 |
| commit | 1e93be39a2e77304de7aa7f99feb52f82d0175a2 (patch) | |
| tree | 506d2cfb3cf3da9a3a46b692d17816270776ed66 | |
| parent | b5dc200d6db9c5264bd891922d0a726c90337085 (diff) | |
| download | FreeBSD-ports-1e93be39a2e77304de7aa7f99feb52f82d0175a2.zip FreeBSD-ports-1e93be39a2e77304de7aa7f99feb52f82d0175a2.tar.gz | |
Back out the recently added kludge. Instead, install the
compat-libstdc++ RPM. PORTREVISION++ too.
| -rw-r--r-- | emulators/linux_base-7/Makefile | 11 | ||||
| -rw-r--r-- | emulators/linux_base-7/distinfo.i386 | 1 | ||||
| -rw-r--r-- | emulators/linux_base-7/pkg-plist.i386 | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/emulators/linux_base-7/Makefile b/emulators/linux_base-7/Makefile index 736b573..86e7dcc4 100644 --- a/emulators/linux_base-7/Makefile +++ b/emulators/linux_base-7/Makefile @@ -7,6 +7,7 @@ PORTNAME= linux_base PORTVERSION= 7.1 +PORTREVISION= 1 CATEGORIES= emulators linux MASTER_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} DISTFILES= ${RPM_GLIBC_COMMON} \ @@ -24,6 +25,7 @@ DISTFILES= ${RPM_GLIBC_COMMON} \ bash-2.04-21.${MACHINE_ARCH}.rpm \ ${RPM_BZIP2} \ ${RPM_LIBSTDCXX} \ + ${RPM_COMPAT_LIBSTDCXX} \ ncurses-5.2-8.${MACHINE_ARCH}.rpm \ info-4.0-20.${MACHINE_ARCH}.rpm \ fileutils-4.0.36-4.${MACHINE_ARCH}.rpm \ @@ -78,6 +80,7 @@ RPM_GDBM= gdbm-1.8.0-5.i386.rpm RPM_GLIBC= glibc-2.2.2-10.i386.rpm RPM_GLIBC_COMMON= glibc-common-2.2.2-10.i386.rpm RPM_LIBSTDCXX= +RPM_COMPAT_LIBSTDCXX= compat-libstdc++-6.2-2.9.0.14.i386.rpm RPM_SETSERIAL= setserial-2.17-2.i386.rpm RPM_SETUP= setup-2.4.7-1.noarch.rpm RPM_XFREE86_LIBS= XFree86-libs-4.0.3-5.i386.rpm @@ -89,6 +92,7 @@ RPM_GDBM= gdbm-1.8.0-6.alpha.rpm RPM_GLIBC= glibc-2.2.3-11.alpha.rpm RPM_GLIBC_COMMON= glibc-common-2.2.3-11.alpha.rpm RPM_LIBSTDCXX= libstdc++-2.96-87.alpha.rpm +RPM_COMPAT_LIBSTDCXX= RPM_SETSERIAL= setserial-2.17-3.alpha.rpm RPM_SETUP= setup-2.4.7-2.noarch.rpm RPM_XFREE86_LIBS= XFree86-libs-4.0.3-21.alpha.rpm @@ -165,13 +169,6 @@ do-install: ${RM} -f ${LINUXBASE}/$$F; \ done @${LN} -s /var/tmp ${LINUXBASE}/usr/tmp -# -# kludge for pre-compiled Netscape 6 and Mozilla -# -.if (${MACHINE_ARCH} == "i386") - @cd ${LINUXBASE}/usr/lib && \ - ${LN} -fs libstdc++-3-libc6.2-2-2.10.0.so libstdc++-libc6.1-1.so.2 -.endif post-install: @${ECHO} '' diff --git a/emulators/linux_base-7/distinfo.i386 b/emulators/linux_base-7/distinfo.i386 index 014a6ce..4350b7c 100644 --- a/emulators/linux_base-7/distinfo.i386 +++ b/emulators/linux_base-7/distinfo.i386 @@ -12,6 +12,7 @@ MD5 (rpm/glib-1.2.9-1.i386.rpm) = 63a7a9d22c1d2f38a59c919ffda35c9c MD5 (rpm/libtermcap-2.0.8-26.i386.rpm) = 52a57b5fa1f146adf3dcf4f552a8e5b8 MD5 (rpm/bash-2.04-21.i386.rpm) = 99a6c7fd6730e97697f658b007dbd927 MD5 (rpm/bzip2-1.0.1-3.i386.rpm) = 2f6c5671617dcd0a7facc84d4428841a +MD5 (rpm/compat-libstdc++-6.2-2.9.0.14.i386.rpm) = 5cf1e116fd22b5117e78df717068a244 MD5 (rpm/ncurses-5.2-8.i386.rpm) = ca4b2077429920820489d40800e5a803 MD5 (rpm/info-4.0-20.i386.rpm) = 4600aeee40e404584c30f2b94fc6eed8 MD5 (rpm/fileutils-4.0.36-4.i386.rpm) = bb2c343c6df36d9bdde4bea8dd6ca111 diff --git a/emulators/linux_base-7/pkg-plist.i386 b/emulators/linux_base-7/pkg-plist.i386 index c1fbfa5..8a8ad05 100644 --- a/emulators/linux_base-7/pkg-plist.i386 +++ b/emulators/linux_base-7/pkg-plist.i386 @@ -420,6 +420,8 @@ usr/lib/libform.so.5 usr/lib/libform.so.5.2 usr/lib/libfreetype.so.6 usr/lib/libfreetype.so.6.0.1 +usr/lib/libg++.so.2.7.2 +usr/lib/libg++.so.2.7.2.8 usr/lib/libgdbm.so.2 usr/lib/libgdbm.so.2.0.0 usr/lib/libglib-1.2.so.0 @@ -454,9 +456,16 @@ usr/lib/librpmio.so.0 usr/lib/librpmio.so.0.0.0 usr/lib/libslang.so.1 usr/lib/libslang.so.1.4.2 +usr/lib/libstdc++-2-libc6.1-1-2.9.0.so usr/lib/libstdc++-3-libc6.2-2-2.10.0.so usr/lib/libstdc++-libc6.1-1.so.2 usr/lib/libstdc++-libc6.2-2.so.3 +usr/lib/libstdc++.so.2.7.2 +usr/lib/libstdc++.so.2.7.2.8 +usr/lib/libstdc++.so.2.8 +usr/lib/libstdc++.so.2.8.0 +usr/lib/libstdc++.so.2.9 +usr/lib/libstdc++.so.2.9.dummy usr/lib/libttf.so.2 usr/lib/libttf.so.2.3.0 usr/lib/libz.so.1 |
