mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -1,19 +0,0 @@
|
||||
DESCRIPTION="Standard commands to read man pages."
|
||||
HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
|
||||
SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz"
|
||||
CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-apps/groff >= 1.20.1"
|
||||
BUILD {
|
||||
cd man-1.6f
|
||||
./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd man-1.6f
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="1989-2009 Free Software Foundation, Inc."
|
||||
@@ -1,21 +0,0 @@
|
||||
DESCRIPTION="Standard commands to read man pages."
|
||||
HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
|
||||
SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
|
||||
CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-apps/groff >= 1.20.1"
|
||||
BUILD {
|
||||
cd man-1.6g
|
||||
./configure -prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
-sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
|
||||
-confdir=`finddir B_COMMON_SETTINGS_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd man-1.6g
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="1989-2012 Free Software Foundation, Inc."
|
||||
94
sys-apps/man/man-1.6g.recipe
Normal file
94
sys-apps/man/man-1.6g.recipe
Normal file
@@ -0,0 +1,94 @@
|
||||
SUMMARY="Standard commands to read man pages"
|
||||
DESCRIPTION="Standard commands to read man pages."
|
||||
HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
|
||||
SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
|
||||
CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="1989-2012 Free Software Foundation, Inc."
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PATCHES="man-1.6g.patchset"
|
||||
|
||||
PROVIDES="
|
||||
man = $portVersion compat >= 1.6
|
||||
cmd:apropos = $portVersion compat >= 1.6
|
||||
cmd:makewhatis = $portVersion compat >= 1.6
|
||||
cmd:man = $portVersion compat >= 1.6
|
||||
cmd:man2dvi = $portVersion compat >= 1.6
|
||||
cmd:man2html = $portVersion compat >= 1.6
|
||||
cmd:whatis = $portVersion compat >= 1.6
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
cmd:awk
|
||||
cmd:bzip2
|
||||
cmd:cat
|
||||
cmd:cmp
|
||||
cmd:eqn
|
||||
cmd:groff
|
||||
cmd:gunzip
|
||||
cmd:less
|
||||
cmd:nroff
|
||||
cmd:refer
|
||||
cmd:tbl
|
||||
cmd:zcat
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
cmd:awk
|
||||
cmd:bzip2
|
||||
cmd:cat
|
||||
cmd:cmp
|
||||
cmd:eqn
|
||||
cmd:groff
|
||||
cmd:gunzip
|
||||
cmd:less
|
||||
cmd:nroff
|
||||
cmd:pic
|
||||
cmd:refer
|
||||
cmd:tbl
|
||||
cmd:zcat
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/man.conf keep-old
|
||||
"
|
||||
|
||||
SOURCE_DIR="$portVersionedName"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
awk=$portPackageLinksDir/cmd~awk/bin/awk \
|
||||
bzip2=$portPackageLinksDir/cmd~bzip2/bin/bzip2 \
|
||||
cat=$portPackageLinksDir/cmd~cat/bin/cat \
|
||||
cmp=$portPackageLinksDir/cmd~cmp/bin/cmp \
|
||||
eqn=$portPackageLinksDir/cmd~eqn/bin/eqn \
|
||||
groff=$portPackageLinksDir/cmd~groff/bin/groff \
|
||||
gunzip=$portPackageLinksDir/cmd~gunzip/bin/gunzip \
|
||||
nroff=$portPackageLinksDir/cmd~nroff/bin/nroff \
|
||||
less=$portPackageLinksDir/cmd~less/bin/less \
|
||||
pic=$portPackageLinksDir/cmd~pic/bin/pic \
|
||||
refer=$portPackageLinksDir/cmd~refer/bin/refer \
|
||||
tbl=$portPackageLinksDir/cmd~tbl/bin/tbl \
|
||||
zcat=$portPackageLinksDir/cmd~zcat/bin/zcat \
|
||||
LIBS=-lbe ./configure -prefix=$prefix \
|
||||
-bindir=$binDir \
|
||||
-sbindir=$sbinDir \
|
||||
-confdir=$sysconfDir \
|
||||
-mandir=$manDir
|
||||
# no autotools configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
diff -up man-1.6f/configure.orig man-1.6f/configure
|
||||
--- man-1.6f/configure.orig 2007-08-20 22:15:21.024379392 -0600
|
||||
+++ man-1.6f/configure 2010-08-30 21:38:47.617349120 -0600
|
||||
@@ -283,6 +283,12 @@ if test -f /xenix; then
|
||||
esac
|
||||
fi
|
||||
|
||||
+echo checking for Haiku
|
||||
+if test `uname` = "Haiku"; then
|
||||
+ LIBS="$LIBS -llocale"
|
||||
+ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
|
||||
+fi
|
||||
+
|
||||
echo checking how to get alloca
|
||||
echo '
|
||||
#ifdef __GNUC__
|
||||
diff -up man-1.6f/man2html/Makefile.in.orig man-1.6f/man2html/Makefile.in
|
||||
--- man-1.6f/man2html/Makefile.in.orig 2006-04-25 00:44:15.028835840 -0600
|
||||
+++ man-1.6f/man2html/Makefile.in 2010-08-30 21:35:20.566493184 -0600
|
||||
@@ -1,7 +1,7 @@
|
||||
CC = @CC@
|
||||
CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
|
||||
-bindir = $(DESTDIR)$(PREFIX)/usr/bin
|
||||
+bindir = $(DESTDIR)$(PREFIX)/bin
|
||||
mandir = $(DESTDIR)$(PREFIX)@mandir@
|
||||
vardir = $(DESTDIR)$(PREFIX)/var
|
||||
httpdir = $(DESTDIR)$(PREFIX)/home/httpd
|
||||
diff -up man-1.6f/src/Makefile.in.orig man-1.6f/src/Makefile.in
|
||||
--- man-1.6f/src/Makefile.in.orig 2010-08-30 21:36:40.814219264 -0600
|
||||
+++ man-1.6f/src/Makefile.in 2010-08-30 21:36:58.706740224 -0600
|
||||
@@ -29,6 +29,8 @@ LDFLAGS ?= -s
|
||||
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
||||
+LIBS = @LIBS@
|
||||
+
|
||||
all: man man.conf apropos whatis makewhatis
|
||||
|
||||
MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \
|
||||
diff -up man-1.6f/src/man.conf.in.orig man-1.6f/src/man.conf.in
|
||||
--- man-1.6f/src/man.conf.in.orig 2007-08-20 22:15:21.026476544 -0600
|
||||
+++ man-1.6f/src/man.conf.in 2010-08-30 21:35:20.568328192 -0600
|
||||
@@ -36,11 +36,14 @@
|
||||
#
|
||||
# Every automatically generated MANPATH includes these fields
|
||||
#
|
||||
-MANPATH /usr/man
|
||||
-MANPATH /usr/share/man
|
||||
-MANPATH /usr/local/man
|
||||
-MANPATH /usr/local/share/man
|
||||
-MANPATH /usr/X11R6/man
|
||||
+MANPATH /boot/common/man
|
||||
+MANPATH /boot/common/share/man
|
||||
+MANPATH /boot/home/config/man
|
||||
+MANPATH /boot/home/config/share/man
|
||||
+MANPATH /boot/common/*/man
|
||||
+MANPATH /boot/common/*/share/man
|
||||
+MANPATH /boot/home/config/*/man
|
||||
+MANPATH /boot/home/config/*/share/man
|
||||
#
|
||||
# Uncomment if you want to include one of these by default
|
||||
#
|
||||
@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man
|
||||
# in the mandatory manpath already, but will keep man from statting
|
||||
# lots of other nearby files and directories.
|
||||
#
|
||||
-MANPATH_MAP /bin /usr/share/man
|
||||
-MANPATH_MAP /sbin /usr/share/man
|
||||
-MANPATH_MAP /usr/bin /usr/share/man
|
||||
-MANPATH_MAP /usr/sbin /usr/share/man
|
||||
-MANPATH_MAP /usr/local/bin /usr/local/share/man
|
||||
-MANPATH_MAP /usr/local/sbin /usr/local/share/man
|
||||
-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
|
||||
-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
|
||||
-MANPATH_MAP /usr/bin/mh /usr/share/man
|
||||
+MANPATH_MAP /bin /boot/common/share/man
|
||||
+MANPATH_MAP /boot/common/bin /boot/common/share/man
|
||||
+MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man
|
||||
#
|
||||
# NOAUTOPATH keeps man from automatically adding directories that look like
|
||||
# manual page directories to the path.
|
||||
184
sys-apps/man/patches/man-1.6g.patchset
Normal file
184
sys-apps/man/patches/man-1.6g.patchset
Normal file
@@ -0,0 +1,184 @@
|
||||
From 6cf4a0ec87d16e849eb8b2ec9563f75e5ef0c802 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Thu, 3 Oct 2013 02:20:36 +0200
|
||||
Subject: Set correct default man page search paths
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4928ae0..72f37a5 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1368,6 +1368,10 @@ s,@man_config_dir@,$man_config_dir,
|
||||
s,@man_config_file@,$man_config_file,
|
||||
s,@manpathoption@,$manpathoption,
|
||||
s/@sections@/$sections/
|
||||
+s,@haikuSystemManDir@,`finddir B_SYSTEM_DOCUMENTATION_DIRECTORY`/man,
|
||||
+s,@haikuSystemNonPackagedManDir@,`finddir B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man,
|
||||
+s,@haikuUserManDir@,`finddir B_USER_DOCUMENTATION_DIRECTORY`/man,
|
||||
+s,@haikuUserNonPackagedManDir@,`finddir B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man,
|
||||
' $infile.in >> $infile
|
||||
done
|
||||
EOS
|
||||
diff --git a/src/man.conf.in b/src/man.conf.in
|
||||
index ce73ffc..346230f 100644
|
||||
--- a/src/man.conf.in
|
||||
+++ b/src/man.conf.in
|
||||
@@ -36,11 +36,10 @@
|
||||
#
|
||||
# Every automatically generated MANPATH includes these fields
|
||||
#
|
||||
-MANPATH /usr/man
|
||||
-MANPATH /usr/share/man
|
||||
-MANPATH /usr/local/man
|
||||
-MANPATH /usr/local/share/man
|
||||
-MANPATH /usr/X11R6/man
|
||||
+MANPATH @haikuUserNonPackagedManDir@
|
||||
+MANPATH @haikuUserManDir@
|
||||
+MANPATH @haikuSystemNonPackagedManDir@
|
||||
+MANPATH @haikuSystemManDir@
|
||||
#
|
||||
# Uncomment if you want to include one of these by default
|
||||
#
|
||||
@@ -58,15 +57,7 @@ MANPATH /usr/X11R6/man
|
||||
# in the mandatory manpath already, but will keep man from statting
|
||||
# lots of other nearby files and directories.
|
||||
#
|
||||
-MANPATH_MAP /bin /usr/share/man
|
||||
-MANPATH_MAP /sbin /usr/share/man
|
||||
-MANPATH_MAP /usr/bin /usr/share/man
|
||||
-MANPATH_MAP /usr/sbin /usr/share/man
|
||||
-MANPATH_MAP /usr/local/bin /usr/local/share/man
|
||||
-MANPATH_MAP /usr/local/sbin /usr/local/share/man
|
||||
-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
|
||||
-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
|
||||
-MANPATH_MAP /usr/bin/mh /usr/share/man
|
||||
+MANPATH_MAP /bin @haikuSystemManDir@
|
||||
#
|
||||
# NOAUTOPATH keeps man from automatically adding directories that look like
|
||||
# manual page directories to the path.
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 9e1bfb921e27bbe735ad965c72de53c2f5183d0d Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Thu, 3 Oct 2013 02:21:37 +0200
|
||||
Subject: src/Makefile.in: Add missing LIBS
|
||||
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 0b08305..4df0661 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -30,6 +30,8 @@ LDFLAGS ?= -s
|
||||
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
||||
+LIBS = @LIBS@
|
||||
+
|
||||
all: man$(EXEEXT) man.conf apropos whatis makewhatis
|
||||
|
||||
MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 7444be20edf578bb159e26e1e808470377709802 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Thu, 3 Oct 2013 02:22:08 +0200
|
||||
Subject: man2html/Makefile.in: Fix mandir and bindir
|
||||
|
||||
|
||||
diff --git a/man2html/Makefile.in b/man2html/Makefile.in
|
||||
index b41eaba..0c87919 100644
|
||||
--- a/man2html/Makefile.in
|
||||
+++ b/man2html/Makefile.in
|
||||
@@ -2,8 +2,8 @@ CC = @CC@
|
||||
CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
|
||||
EXEEXT = @EXEEXT@
|
||||
-bindir = $(DESTDIR)$(PREFIX)/usr/bin
|
||||
-mandir = $(DESTDIR)$(PREFIX)@mandir@
|
||||
+bindir = $(DESTDIR)@bindir@
|
||||
+mandir = $(DESTDIR)@mandir@
|
||||
vardir = $(DESTDIR)$(PREFIX)/var
|
||||
httpdir = $(DESTDIR)$(PREFIX)/home/httpd
|
||||
cgiowner = nobody
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 914beae0b7420f8bddf3b2b89883c3a561c9c30e Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Thu, 3 Oct 2013 02:22:33 +0200
|
||||
Subject: configure: Support presetting env vars for commands
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 72f37a5..c838d25 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -406,6 +406,11 @@ if test "$ans" = "false"
|
||||
then
|
||||
for i in more less cmp cat awk gawk mawk
|
||||
do
|
||||
+ if eval "test \"x\$$i\" != x"
|
||||
+ then
|
||||
+ eval F$i=\$$i
|
||||
+ continue
|
||||
+ fi
|
||||
eval F$i="missing"
|
||||
for j in $DEFPATH
|
||||
do
|
||||
@@ -450,6 +455,11 @@ then
|
||||
else
|
||||
for i in nroff groff geqn gtbl col vgrind grefer grap gpic more less lynx cmp cat awk gawk mawk
|
||||
do
|
||||
+ if eval "test \"x\$$i\" != x"
|
||||
+ then
|
||||
+ eval F$i=\$$i
|
||||
+ continue
|
||||
+ fi
|
||||
eval F$i="missing"
|
||||
for j in $DEFPATH
|
||||
do
|
||||
@@ -464,6 +474,11 @@ else
|
||||
do
|
||||
if test `eval echo \\$Fg$i` = "missing"
|
||||
then
|
||||
+ if eval "test \"x\$$i\" != x"
|
||||
+ then
|
||||
+ eval Fg$i=\$$i
|
||||
+ continue
|
||||
+ fi
|
||||
for j in $DEFPATH
|
||||
do
|
||||
if test -f $j/$i
|
||||
@@ -1021,6 +1036,12 @@ then
|
||||
compress=
|
||||
for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
|
||||
do
|
||||
+ if eval "test \"x\$$i\" != x"
|
||||
+ then
|
||||
+ eval F$i=\$$i
|
||||
+ if [ x$compress = x ]; then eval compress=\$$i; fi
|
||||
+ continue
|
||||
+ fi
|
||||
eval F$i=missing
|
||||
for j in $DEFPATH
|
||||
do
|
||||
@@ -1119,6 +1140,11 @@ fi
|
||||
UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
|
||||
for i in $UNCOMPRESSORS
|
||||
do
|
||||
+ if eval "test \"x\$$i\" != x"
|
||||
+ then
|
||||
+ eval F$i=\$$i
|
||||
+ continue
|
||||
+ fi
|
||||
eval F$i=missing
|
||||
for j in $DEFPATH
|
||||
do
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user