- install man page in language corresponding to flavor

- handle mime.types better
This commit is contained in:
naddy 2001-11-17 02:36:40 +00:00
parent 5ded375106
commit c89bfe43d9
2 changed files with 18 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2001/11/16 21:35:44 naddy Exp $
# $OpenBSD: Makefile,v 1.32 2001/11/17 02:36:40 naddy Exp $
ONLY_FOR_ARCHS= i386 sparc m68k
@ -29,7 +29,9 @@ CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS}" \
CONFIGURE_ENV= use_nntp=y use_ssl_verify=y \
dmail=mail ded=vi dbrowser=lynx dcc="${CC}" \
dtermlib="${TERMLIB}" def_helpdir="${PREFIX}/share/w3m" \
def_libdir="${PREFIX}/libexec/w3m"
def_libdir="${PREFIX}/libexec/w3m" \
MIME_TYPES="/var/www/conf/mime.types"
NO_REGRESS= Yes
DOCS= FAQ.html HISTORY MANUAL.html \
README README.dict README.func STORY.html \
@ -56,9 +58,7 @@ pre-build:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${DOCSRC}/w3m.1 ${PREFIX}/man/man1
cd ${DOCSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
NO_REGRESS= Yes
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2001/11/16 21:35:45 naddy Exp $
$OpenBSD: patch-configure,v 1.4 2001/11/17 02:36:41 naddy Exp $
--- configure.orig Thu Nov 15 01:32:13 2001
+++ configure Fri Nov 16 19:29:45 2001
+++ configure Sat Nov 17 03:01:53 2001
@@ -859,6 +859,7 @@ else
inflate=
fi
@ -17,22 +17,19 @@ $OpenBSD: patch-configure,v 1.3 2001/11/16 21:35:45 naddy Exp $
case $sysname in
linux|Linux|LINUX|aix|Aix|AIX)
@@ -967,17 +969,7 @@ echo "dldflags='$ldflags'" >> config.par
@@ -967,6 +969,7 @@ echo "dldflags='$ldflags'" >> config.par
echo "Checking machine dependency."
###### mime.types
-MIME_TYPES=""
-for d in /usr/lib /usr/local/lib $prefix/lib /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape
-do
- if [ -f $d/mime.types ]; then
- MIME_TYPES="$d/mime.types"
- fi
-done
-if [ -z "$MIME_TYPES" ]; then
- echo "Global mime.types not found; Hope /usr/local/lib/mime.types works."
- MIME_TYPES=/usr/local/lib/mime.types
-fi
+MIME_TYPES=/var/www/conf/mime.types
+if [ -z "$MIME_TYPES" ]; then
MIME_TYPES=""
for d in /usr/lib /usr/local/lib $prefix/lib /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape
do
@@ -977,6 +980,7 @@ done
if [ -z "$MIME_TYPES" ]; then
echo "Global mime.types not found; Hope /usr/local/lib/mime.types works."
MIME_TYPES=/usr/local/lib/mime.types
+fi
fi
####### ranlib
if ./which ranlib > /dev/null