diff options
author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-10-29 02:09:39 +0000 |
---|---|---|
committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-10-29 02:09:39 +0000 |
commit | 676071dc99e5a4043c3560b30952ca8e45430e5e (patch) | |
tree | 2d7ab3526a46808a07dc60e338e47fbce5f3c444 /lang | |
parent | Fix spelling. (diff) |
o fix install: change GCC_REV to match existing one.
o unify info files for future update.
o ${MKDIR} ${PREFIX}/info is not needed as it is in BSD.local.dist.
Reviewed by: maintainer
Notes
Notes:
svn path=/head/; revision=49305
Diffstat (limited to 'lang')
-rw-r--r-- | lang/pgcc/Makefile | 8 | ||||
-rw-r--r-- | lang/pgcc/files/patch-va | 17 | ||||
-rw-r--r-- | lang/pgcc/files/patch-vb | 11 | ||||
-rw-r--r-- | lang/pgcc/pkg-plist | 54 |
4 files changed, 28 insertions, 62 deletions
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile index cbd0e6c4f763..4e4017cdac05 100644 --- a/lang/pgcc/Makefile +++ b/lang/pgcc/Makefile @@ -34,7 +34,7 @@ USE_BZIP2= yes .include <bsd.port.pre.mk> -GCC_REV= p${DISTNAME} +GCC_REV= ${PKGNAME} LIBSTDCPP_REV= 4 .if ${PORTOBJFORMAT} == "elf" @@ -62,18 +62,18 @@ MAN1= cccp.1 pg++.1 pg77.1 pgcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h + cd ${WRKSRC}/gcc; ${RM} -f gcc.info* cpp.info* f/g77.info* pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ ${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ >${WRKSRC}/gcc/config/freebsd.h ) + +pre-install: .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST} .endif -pre-install: - ${MKDIR} ${PREFIX}/info - post-install: @${RM} -f ${PREFIX}/bin/c++ @${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt diff --git a/lang/pgcc/files/patch-va b/lang/pgcc/files/patch-va index 48040ffa6e96..de286822793d 100644 --- a/lang/pgcc/files/patch-va +++ b/lang/pgcc/files/patch-va @@ -1,6 +1,15 @@ ---- gcc/Makefile.in.orig Thu Feb 25 12:40:16 1999 -+++ gcc/Makefile.in Mon Mar 1 04:36:40 1999 -@@ -793,7 +793,7 @@ +--- gcc/Makefile.in.orig Fri Aug 13 16:46:55 1999 ++++ gcc/Makefile.in Sat Oct 27 23:11:06 2001 +@@ -108,7 +108,7 @@ + MAKEINFO = `if [ -f $(objdir)/../texinfo/makeinfo/Makefile ] ; \ + then echo $(objdir)/../texinfo/makeinfo/makeinfo ; \ + else echo makeinfo ; fi` +-MAKEINFOFLAGS = ++MAKEINFOFLAGS = --no-split + TEXI2DVI = texi2dvi + # For GNUmake: let us decide what gets passed to recursive makes. + MAKEOVERRIDES = +@@ -802,7 +802,7 @@ rm -f config.run $(srcdir)/configure: $(srcdir)/configure.in @@ -9,7 +18,7 @@ # cstamp-h.in controls rebuilding of config.in. # It is named cstamp-h.in and not stamp-h.in so the mostlyclean rule doesn't -@@ -806,7 +806,7 @@ +@@ -815,7 +815,7 @@ # ??? Newer versions have a maintainer mode that may be useful here. $(srcdir)/config.in: $(srcdir)/cstamp-h.in $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h diff --git a/lang/pgcc/files/patch-vb b/lang/pgcc/files/patch-vb new file mode 100644 index 000000000000..b79f11f3dc36 --- /dev/null +++ b/lang/pgcc/files/patch-vb @@ -0,0 +1,11 @@ +--- gcc/f/Make-lang.in.orig Mon Jun 7 15:44:57 1999 ++++ gcc/f/Make-lang.in Sat Oct 27 22:25:27 2001 +@@ -229,7 +229,7 @@ + esac + if [ -f lang-f77 ]; then \ + rm -f $(srcdir)/f/g77.info-*; \ +- $(MAKEINFO) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \ + else true; fi + + f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ diff --git a/lang/pgcc/pkg-plist b/lang/pgcc/pkg-plist index b57348facf4d..37cc729e7b32 100644 --- a/lang/pgcc/pkg-plist +++ b/lang/pgcc/pkg-plist @@ -166,62 +166,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h @unexec install-info --delete %D/info/g77.info %D/info/dir @unexec install-info --delete %D/info/cpp.info %D/info/dir info/cpp.info -info/cpp.info-1 -info/cpp.info-2 -info/cpp.info-3 info/g77.info -info/g77.info-1 -info/g77.info-10 -info/g77.info-11 -info/g77.info-12 -info/g77.info-13 -info/g77.info-14 -info/g77.info-15 -info/g77.info-16 -info/g77.info-17 -info/g77.info-18 -info/g77.info-19 -info/g77.info-2 -info/g77.info-20 -info/g77.info-21 -info/g77.info-3 -info/g77.info-4 -info/g77.info-5 -info/g77.info-6 -info/g77.info-7 -info/g77.info-8 -info/g77.info-9 info/gcc.info -info/gcc.info-1 -info/gcc.info-10 -info/gcc.info-11 -info/gcc.info-12 -info/gcc.info-13 -info/gcc.info-14 -info/gcc.info-15 -info/gcc.info-16 -info/gcc.info-17 -info/gcc.info-18 -info/gcc.info-19 -info/gcc.info-2 -info/gcc.info-20 -info/gcc.info-21 -info/gcc.info-22 -info/gcc.info-23 -info/gcc.info-24 -info/gcc.info-25 -info/gcc.info-26 -info/gcc.info-27 -info/gcc.info-28 -info/gcc.info-29 -info/gcc.info-30 -info/gcc.info-3 -info/gcc.info-4 -info/gcc.info-5 -info/gcc.info-6 -info/gcc.info-7 -info/gcc.info-8 -info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir |