diff options
author | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
commit | 4f86bcfec5555230da41b4d94c900395b16b4141 (patch) | |
tree | 0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /lang | |
parent | 52ba4711325c7f3c8cef95c685f630d8d52447fd (diff) | |
download | pkgsrc-4f86bcfec5555230da41b4d94c900395b16b4141.tar.gz |
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead.
* Properly account for split info files during installation.
* Move info file listings directly into the package PLISTs.
This fixes info-file-related PLIST problems.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc-ssp/Makefile | 9 | ||||
-rw-r--r-- | lang/gcc-ssp/PLIST | 7 | ||||
-rw-r--r-- | lang/gcc/Makefile | 11 | ||||
-rw-r--r-- | lang/gcc/PLIST | 6 | ||||
-rw-r--r-- | lang/gcc3/Makefile.common | 6 | ||||
-rw-r--r-- | lang/guile14/Makefile | 6 | ||||
-rw-r--r-- | lang/guile14/PLIST | 3 |
7 files changed, 27 insertions, 21 deletions
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile index 8e8473a6049..49edf923b4c 100644 --- a/lang/gcc-ssp/Makefile +++ b/lang/gcc-ssp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2006/03/20 18:15:38 jlam Exp $ DISTNAME= gcc-2.95.3 PKGNAME= gcc-ssp-2.95.3.13 @@ -43,11 +43,12 @@ MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} -FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} GCC_PREFIX=${GCC_PREFIX:Q} +FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} \ + GCC_PREFIX=${GCC_PREFIX:Q} +PLIST_SUBST+= GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} -INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info -INFO_FILES= chill.info cpp.info g77.info gcc.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" diff --git a/lang/gcc-ssp/PLIST b/lang/gcc-ssp/PLIST index bdfed7871f6..32c8e9c3f5e 100644 --- a/lang/gcc-ssp/PLIST +++ b/lang/gcc-ssp/PLIST @@ -1,3 +1,8 @@ -@comment $NetBSD: PLIST,v 1.6 2003/08/09 12:43:02 seb Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $ +${GCC_PREFIX}/info/chill.info +${GCC_PREFIX}/info/cpp.info +${GCC_PREFIX}/info/g77.info +${GCC_PREFIX}/info/gcc.info share/examples/${PKGNAME}/mk.conf @dirrm share/examples/${PKGNAME} +@dirrm share/examples/${PKGNAME} diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index cf2cd433ad7..17d4adb1e48 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.88 2006/03/20 18:15:38 jlam Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 7 @@ -32,12 +32,13 @@ MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} -FILES_SUBST+= DISTNAME=${DISTNAME:Q} GCC_PREFIX=${GCC_PREFIX:Q} +FILES_SUBST+= DISTNAME=${DISTNAME:Q} \ + GCC_PREFIX=${GCC_PREFIX:Q} MESSAGE_SUBST+= DISTNAME=${DISTNAME} -PLIST_SUBST+= DISTNAME=${DISTNAME:Q} +PLIST_SUBST+= DISTNAME=${DISTNAME:Q} \ + GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q} -INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info -INFO_FILES= chill.info cpp.info g77.info gcc.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST index a2b60e6a9da..1304fe5b846 100644 --- a/lang/gcc/PLIST +++ b/lang/gcc/PLIST @@ -1,3 +1,7 @@ -@comment $NetBSD: PLIST,v 1.12 2003/07/13 13:16:03 grant Exp $ +@comment $NetBSD: PLIST,v 1.13 2006/03/20 18:15:38 jlam Exp $ +${GCC_PREFIX}/info/chill.info +${GCC_PREFIX}/info/cpp.info +${GCC_PREFIX}/info/g77.info +${GCC_PREFIX}/info/gcc.info share/examples/${DISTNAME}/mk.conf @dirrm share/examples/${DISTNAME} diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common index 5f8debab053..d896acf0feb 100644 --- a/lang/gcc3/Makefile.common +++ b/lang/gcc3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2006/03/20 18:15:38 jlam Exp $ GCC_VERSION= 3.3.5 DISTNAME= gcc-${GCC_VERSION} @@ -37,10 +37,6 @@ MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} BUILDLINK_PASSTHRU_RPATHDIRS+= ${GCC_PREFIX} -.if defined(INFO_FILES) -INFO_DIR= ${GCC_SUBPREFIX}/info -.endif - # These come from $WRKSRC/Makefile.in ALL_GCC= all-gcc ALL_GCC_C= $$(ALL_GCC) all-target-newlib all-target-libgloss diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile index c131814bc24..0c47007d3d8 100644 --- a/lang/guile14/Makefile +++ b/lang/guile14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/03/16 23:52:30 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2006/03/20 18:15:38 jlam Exp $ DISTNAME= guile-1.4.1 PKGNAME= guile14-1.4.1 @@ -16,9 +16,7 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES USE_GNU_READLINE= YES PTHREAD_AUTO_VARS= YES - -INFO_DIR= guile/1.4/info -INFO_FILES= guile.info +INFO_FILES= # PLIST BUILDLINK_PASSTHRU_DIRS= ${PREFIX}/guile/1.4 diff --git a/lang/guile14/PLIST b/lang/guile14/PLIST index dd5b8d34868..cdca374766e 100644 --- a/lang/guile14/PLIST +++ b/lang/guile14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:38 jlam Exp $ guile/1.4/bin/guile guile/1.4/bin/guile-config guile/1.4/bin/guile-snarf @@ -89,6 +89,7 @@ guile/1.4/include/libguile/vectors.h guile/1.4/include/libguile/version.h guile/1.4/include/libguile/vports.h guile/1.4/include/libguile/weaks.h +guile/1.4/info/guile.info guile/1.4/lib/libguile.la guile/1.4/lib/libguilereadline.la guile/1.4/share/aclocal/guile.m4 |