From c913f9af7e6d0e1a562b80a976d8f7319b36c38c Mon Sep 17 00:00:00 2001 From: steven Date: Sun, 1 Apr 2007 20:17:28 +0000 Subject: [PATCH] USE_LIBTOOL, disable-static, remove old patch --- net/irssi-icb/Makefile | 7 ++- net/irssi-icb/patches/patch-ltmain_sh | 62 --------------------------- 2 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 net/irssi-icb/patches/patch-ltmain_sh diff --git a/net/irssi-icb/Makefile b/net/irssi-icb/Makefile index 3764c983628..11adf833aa1 100644 --- a/net/irssi-icb/Makefile +++ b/net/irssi-icb/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2006/06/23 06:37:27 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2007/04/01 20:17:28 steven Exp $ -NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} +SHARED_ONLY= Yes COMMENT= "ICB plugin for irssi" DISTNAME= irssi-icb-0.14 +PKGNAME= ${DISTNAME}p0 MASTER_SITES= http://humppa.nl/distfiles/ CATEGORIES= net @@ -19,6 +20,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +USE_LIBTOOL= Yes +LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/irssi-src diff --git a/net/irssi-icb/patches/patch-ltmain_sh b/net/irssi-icb/patches/patch-ltmain_sh deleted file mode 100644 index a42973af48a..00000000000 --- a/net/irssi-icb/patches/patch-ltmain_sh +++ /dev/null @@ -1,62 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.2 2003/01/02 18:56:06 lebel Exp $ ---- ltmain.sh.orig Fri Oct 25 15:13:19 2002 -+++ ltmain.sh Thu Jan 2 13:50:29 2003 -@@ -1082,6 +1082,17 @@ compiler." - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -4569,40 +4580,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 - ;; -