Starting to move man files from /boot/common/man to B_COMMON_DOCUMENTATION/man

This commit is contained in:
Scott McCreary
2010-08-31 06:14:34 +00:00
parent c6c3fa695f
commit 45b426e28c
5 changed files with 48 additions and 40 deletions

View File

@@ -1,34 +0,0 @@
#!/bin/sh
HOMEPAGE="http://p7zip.sourceforge.net/"
PACKAGE="app-arch/p7zip/"
VERSION="4.65"
URL="http://voxel.dl.sourceforge.net/sourceforge/p7zip/"
FILE="p7zip_4.65_src_all.tar.bz2"
# ------- This should not be edited -------
PFX=/boot/common/
HAIKUPORTS="http://ports.haiku-files.org/wiki/"
CWD=`pwd`/
if [ ! -d ${PACKAGE}${VERSION} ] ; then
mkdir -p ${PACKAGE}${VERSION}
fi
if [ ! -e ${FILE} ] ; then
wget ${URL}${FILE}
fi
cd ${PACKAGE}${VERSION}
if [ ${FILE:(-7)} = "tar.bz2" ] ; then
tar -jxvf ${CWD}${FILE}
elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
tar xvf ${CWD}${FILE}
fi
# ------- Begin Instructions -------
cd p7zip_4.65
cp makefile.beos makefile.machine
make && make install DEST_HOME=${PFX} && echo " Installation complete." || echo " Installation FAILED !"
echo " For more information, see:"
echo " ${HAIKUPORTS}${PACKAGE}"
echo " ${HOMEPAGE}"
echo

View File

@@ -13,7 +13,7 @@ BUILD {
INSTALL {
cd p7zip_9.04
make install DEST_DIR="${DESTDIR}" DEST_HOME="/boot/common"
make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/p7zip DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1999-2009 7-Zip Igor Pavlov."

View File

@@ -0,0 +1,14 @@
diff -urN cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap
--- cmake-2.8.1/bootstrap 2010-04-06 14:45:29.040370176 +0000
+++ cmake-2.8.1-haiku/bootstrap 2010-08-31 05:39:55.518520832 +0000
@@ -132,7 +132,9 @@
cmake_default_prefix="c:/Program Files/CMake"
fi
elif ${cmake_system_haiku}; then
- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
+ cmake_man_dir="/documentation/man"
+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
else
cmake_default_prefix="/usr/local"
fi

View File

@@ -27,7 +27,7 @@ BUILD {
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--includedir=`finddir B_COMMON_DIRECTORY`/include \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DIRECTORY`/man \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \
--with-default-path=${PATH} \

View File

@@ -1,6 +1,22 @@
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 2009-12-29 15:10:21.000000000 -0700
+++ man-1.6f/man2html/Makefile.in 2009-12-29 15:10:54.000000000 -0700
--- 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
@@ -10,9 +26,21 @@ diff -up man-1.6f/man2html/Makefile.in.orig man-1.6f/man2html/Makefile.in
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 2009-12-29 14:49:55.000000000 -0700
+++ man-1.6f/src/man.conf.in 2009-12-29 14:56:58.000000000 -0700
--- 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