- add libtool patch

- use compface from mail/faces instead of graphics/compface to be
  able to use sylpheed and sylpheed-claws simultaneous
Mostly from Jim Geovedi <jim@corebsd.or.id>, ok maintainer
This commit is contained in:
wilfried 2003-04-29 13:01:53 +00:00
parent f12170a53f
commit 517ff88060
2 changed files with 88 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2003/03/29 14:06:17 couderc Exp $
# $OpenBSD: Makefile,v 1.39 2003/04/29 13:01:53 wilfried Exp $
COMMENT= "mail/news client in gtk+"
@ -30,13 +30,13 @@ FLAVOR?=
.if ${FLAVOR:L:Mcompface}
PERMIT_PACKAGE_CDROM= "No Fee"
PERMIT_DISTFILES_CDROM= "No Fee"
BUILD_DEPENDS= ::graphics/compface
LIB_DEPENDS+= compface.1::mail/faces
.else
CONFIGURE_ARGS+= --disable-compface
.endif
.if ${FLAVOR:L:Mgpgme}
LIB_DEPENDS= gpgme.4::security/gpgme
LIB_DEPENDS+= gpgme.4::security/gpgme
CONFIGURE_ARGS+= --enable-gpgme
.else
CONFIGURE_ARGS+= --disable-gpgme

View File

@ -0,0 +1,85 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2003/04/29 13:01:53 wilfried Exp $
--- ltmain.sh.orig Fri Mar 7 05:01:54 2003
+++ ltmain.sh Mon Apr 28 16:48:12 2003
@@ -1082,6 +1082,17 @@ compiler."
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1522,6 +1533,10 @@ compiler."
fi
continue
;;
+ -pthread)
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1767,11 +1782,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4569,40 +4579,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;