cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
naddy 2001-09-18 15:53:13 +00:00
parent b6617c0027
commit c2f25283a6
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
textproc/scrollkeeper/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:30 todd Exp $
# $OpenBSD: Makefile,v 1.3 2001/09/18 15:53:13 naddy Exp $
COMMENT= "the Scrollkeeper Open Documentation Cataloging System"
COMMENT= "Scrollkeeper Open Documentation Cataloging System"
V= 0.2
DISTNAME= scrollkeeper-${V}
CATEGORIES= textproc
@ -19,11 +19,11 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
LDFLAGS="-L${LOCALBASE}/lib"
post-extract:
@find ${WRKSRC}/cl/templates -name Makefile.in | xargs \

16
textproc/scrollkeeper/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 15:53:13 naddy Exp $
--- aclocal.m4.orig Wed Mar 28 14:00:03 2001
+++ aclocal.m4 Tue Sep 18 17:31:26 2001
@@ -591,10 +591,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

9
textproc/scrollkeeper/patches/patch-ltconfig
View File

@ -1,5 +1,6 @@
--- ltconfig.orig Sun Oct 3 15:17:34 1999
+++ ltconfig Tue Feb 20 17:11:31 2001
$OpenBSD: patch-ltconfig,v 1.2 2001/09/18 15:53:13 naddy Exp $
--- ltconfig.orig Wed Mar 28 14:00:03 2001
+++ ltconfig Tue Sep 18 17:21:35 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -10,7 +11,7 @@
esac
@@ -1391,10 +1394,21 @@ else
@@ -1402,10 +1405,21 @@ else
;;
openbsd*)
@ -34,7 +35,7 @@
;;
os2*)
@@ -1955,13 +1969,10 @@ netbsd*)
@@ -2021,13 +2035,10 @@ netbsd*)
openbsd*)
version_type=sunos

17
textproc/scrollkeeper/patches/patch-ltmain.sh
View File

@ -1,6 +1,7 @@
--- ltmain.sh.orig Sun Oct 3 15:17:34 1999
+++ ltmain.sh Tue Feb 20 17:12:45 2001
@@ -1073,7 +1073,18 @@ compiler."
$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/18 15:53:13 naddy Exp $
--- ltmain.sh.orig Wed Mar 28 14:00:03 2001
+++ ltmain.sh Tue Sep 18 17:21:35 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
@ -19,7 +20,7 @@
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1085,6 +1096,10 @@ compiler."
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
@ -30,9 +31,9 @@
-module)
module=yes
continue
@@ -1789,6 +1804,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
@ -40,7 +41,7 @@
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0