summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2007-07-23 09:36:51 +0000
committerRong-En Fan <rafan@FreeBSD.org>2007-07-23 09:36:51 +0000
commitf935a609c53c5c6031e6848db95c7debed127e27 (patch)
tree4c3cf6af6588247c0dd3f92f9601357c33c56217 /lang
parent- Accept --infodir argument in configure script so it won't fail when we (diff)
- Set --mandir and --infodir in CONFIGURE_ARGS if the configure script
supports them. This is determined by running ``configure --help'' in do-configure target and set the shell variable _LATE_CONFIGURE_ARGS which is then passed to CONFIGURE_ARGS. - Remove --mandir and --infodir in ports' Makefile where applicable Few ports use REINPLACE_CMD to achieve the same effect, remove them too. - Correct some manual pages location from PREFIX/man to MANPREFIX/man - Define INFO_PATH where necessary - Document that .info files are installed in a subdirectory relative to PREFIX/INFO_PATH and slightly change add-plist-info to use INFO_PATH and subdirectory detection. PR: ports/111470 Approved by: portmgr Discussed with: stas (Mk/*), gerald (info related stuffs) Tested by: pointyhat exp run
Notes
Notes: svn path=/head/; revision=196111
Diffstat (limited to 'lang')
-rw-r--r--lang/clisp/Makefile2
-rw-r--r--lang/gcc/Makefile3
-rw-r--r--lang/gcc33/Makefile3
-rw-r--r--lang/gcc34/Makefile3
-rw-r--r--lang/gcc40/Makefile3
-rw-r--r--lang/gcc41/Makefile3
-rw-r--r--lang/gcc42/Makefile3
-rw-r--r--lang/gcc43/Makefile3
-rw-r--r--lang/gcc44/Makefile3
-rw-r--r--lang/gcc45/Makefile3
-rw-r--r--lang/gcc46/Makefile3
-rw-r--r--lang/gcc47/Makefile3
-rw-r--r--lang/gcc48/Makefile3
-rw-r--r--lang/gcl/Makefile1
-rw-r--r--lang/gnat-gcc34/Makefile3
-rw-r--r--lang/gnat-gcc41/Makefile3
-rw-r--r--lang/gnat-gcc42/Makefile3
-rw-r--r--lang/gnat-gcc43/Makefile3
-rw-r--r--lang/hugs/Makefile3
-rw-r--r--lang/newlisp/Makefile1
-rw-r--r--lang/nickle/Makefile1
-rw-r--r--lang/pfe-devel/Makefile1
-rw-r--r--lang/pfe/Makefile1
-rw-r--r--lang/ruby18/Makefile3
-rw-r--r--lang/smalltalk/Makefile4
25 files changed, 20 insertions, 45 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 86a1fdb0bebc..403b211c0c37 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -33,7 +33,7 @@ CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKEMAKE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man \
+MAKEMAKE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man \
--srcdir=${WRKSRC}/src --with-dynamic-ffi
OPTIONS= BDB "Build Berkeley Database module" off \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index f91d24136ee7..921698e3ea87 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -51,8 +51,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
MAKE_ENV= LD_LIBRARY_PATH=.:${WRKSRC}/gcc
ALL_TARGET= bootstrap-lean
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index af39caea449e..12adbeda5c5e 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -56,8 +56,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
CONFIGURE_ENV= RANLIB=:
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 9a5ba0e5ab70..adeb323c73e8 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -50,8 +50,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 31c2c70567ee..302c43c1e512 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -56,8 +56,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 371f0014936b..2d82c4904ccd 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d1fd5963c01a..5f8a69186610 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
+ --with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 172d0b68a1f3..3da86bb67f9c 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -27,7 +27,6 @@ USE_XLIB= yes
CONFIGURE_ARGS=--prefix=${PREFIX} \
--enable-ansi \
--enable-machine=FreeBSD \
- --infodir=${PREFIX}/info \
--enable-info=${PREFIX}/info \
--enable-tkconfig=${LOCALBASE}/lib/tk8.4 \
--enable-tclconfig=${LOCALBASE}/lib/tcl8.4 \
diff --git a/lang/gnat-gcc34/Makefile b/lang/gnat-gcc34/Makefile
index 18cc31e19b56..f5c3115ac04f 100644
--- a/lang/gnat-gcc34/Makefile
+++ b/lang/gnat-gcc34/Makefile
@@ -65,8 +65,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \
--enable-threads=posix \
--program-suffix=${gcc_suffix} \
--bindir=${PREFIX}/bin/gcc${gcc_suffix} \
- --libdir=${targlib} \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
+ --libdir=${targlib}
BUILD_WRKSRC= ${WRKDIR}/build
diff --git a/lang/gnat-gcc41/Makefile b/lang/gnat-gcc41/Makefile
index c6d25b30cc03..a2d7e5ec7c70 100644
--- a/lang/gnat-gcc41/Makefile
+++ b/lang/gnat-gcc41/Makefile
@@ -70,8 +70,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${gcc_suffix} \
--bindir=${PREFIX}/bin/gcc${gcc_suffix} \
- --libdir=${targlib} \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
+ --libdir=${targlib}
ALL_TARGET= bootstrap-lean
MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/lang/gnat-gcc42/Makefile b/lang/gnat-gcc42/Makefile
index 904506322bb9..4c279fa5f5be 100644
--- a/lang/gnat-gcc42/Makefile
+++ b/lang/gnat-gcc42/Makefile
@@ -70,8 +70,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${gcc_suffix} \
--bindir=${PREFIX}/bin/gcc${gcc_suffix} \
- --libdir=${targlib} \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
+ --libdir=${targlib}
ALL_TARGET= bootstrap-lean
MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/lang/gnat-gcc43/Makefile b/lang/gnat-gcc43/Makefile
index c5621695fd1f..d9d6492f5e88 100644
--- a/lang/gnat-gcc43/Makefile
+++ b/lang/gnat-gcc43/Makefile
@@ -75,8 +75,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${gcc_suffix} \
--bindir=${PREFIX}/bin/gcc${gcc_suffix} \
- --libdir=${targlib} \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
+ --libdir=${targlib}
ALL_TARGET= bootstrap-lean
MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 1a6cf4df1452..e2927760bce3 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -29,8 +29,7 @@ GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
-CONFIGURE_ARGS+= --with-pthreads \
- --mandir=${PREFIX}/man
+CONFIGURE_ARGS+= --with-pthreads
.if ${ARCH} == "ia64"
BROKEN= dumps core during build on ${ARCH}
diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 406b2c76f7dc..6e30319584e5 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -90,7 +90,6 @@ post-patch:
@${REINPLACE_CMD} -E -e "s,install -m 644, \$${BSD_INSTALL_DATA},g" \
-e "s,install -m 755, \$${BSD_INSTALL_SCRIPT},g" \
-e "s,^(datadir=).*,\1${PREFIX}/share,g" \
- -e "s,^(mandir=).*,\1${PREFIX}/man,g" \
-e "s,^(bindir=).*,\1${PREFIX}/bin,g" \
${WRKSRC}/Makefile
diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index ae183d1c0eac..922b41d8ae52 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -16,7 +16,6 @@ COMMENT= A desk calculator language
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
-CONFIGURE_ARGS= --mandir=${PREFIX}/man
# Nickle now has bindings which are likely to pull in libraries that need
# libpthread. Link to it now, since it wouldn't work at runtime.
diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile
index 0897d7d4ea72..8b60ba207d8e 100644
--- a/lang/pfe-devel/Makefile
+++ b/lang/pfe-devel/Makefile
@@ -23,7 +23,6 @@ USE_GNOME= gnometarget lthack
USE_GMAKE= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= pfe/configure
-CONFIGURE_ARGS= --mandir=${PREFIX}/man
MAN1= pfe.1 pfe-config.1
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 0897d7d4ea72..8b60ba207d8e 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -23,7 +23,6 @@ USE_GNOME= gnometarget lthack
USE_GMAKE= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= pfe/configure
-CONFIGURE_ARGS= --mandir=${PREFIX}/man
MAN1= pfe.1 pfe-config.1
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 444c5b3da839..730178842d76 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -21,8 +21,7 @@ COMMENT?= An object-oriented interpreted scripting language
GNU_CONFIGURE= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
- --enable-shared --with-openssl-include=${OPENSSLINC} \
- --mandir=${PREFIX}/man
+ --enable-shared --with-openssl-include=${OPENSSLINC}
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 348f7611c380..780154166dd4 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -27,9 +27,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
ac_cv_prog_EMACS=no
-CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
- --infodir=${PREFIX}/${INFO_PATH} \
- --enable-generational-gc=no \
+CONFIGURE_ARGS= --enable-generational-gc=no \
--enable-gtk=no \
--with-emacs=no \
--with-gmp=no
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 12:47:29 +0000