- Delete the .la files.
- Get rid of using libtool's --tag=disable-static option. - Stop moving the libjabber / liboscar libraries and properly set the rpath for the XMPP / AIM / ICQ protocol plugins. From Brad (MAINTAINER) ac_cv_openssl_libs "fix" and WANTLIB fix by me.
This commit is contained in:
dcoppa
parent
4c34ff0cae
commit
75711dc648
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.94 2011/06/08 18:00:49 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.95 2011/07/07 08:28:04 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -11,9 +11,9 @@ DISTNAME= pidgin-${VERSION}
|
||||
PKGNAME-main= pidgin-${VERSION}
|
||||
PKGNAME-finch= finch-${VERSION}
|
||||
PKGNAME-libpurple= libpurple-${VERSION}
|
||||
REVISION-main= 0
|
||||
REVISION-finch= 0
|
||||
REVISION-libpurple= 0
|
||||
REVISION-main= 1
|
||||
REVISION-finch= 1
|
||||
REVISION-libpurple= 1
|
||||
.for i in -finch -libpurple
|
||||
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
|
||||
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
|
||||
@ -38,8 +38,8 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
|
||||
gthread-2.0 m pcre pthread util xml2 z
|
||||
WANTLIB= c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 \
|
||||
gobject-2.0 gthread-2.0 m pcre pthread util xml2 z
|
||||
|
||||
WANTLIB-main= GL X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
|
||||
Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm atk-1.0 cairo \
|
||||
@ -80,7 +80,6 @@ MODGCONF2_LIBDEP= No
|
||||
|
||||
SEPARATE_BUILD= simple
|
||||
USE_LIBTOOL= Yes
|
||||
LIBTOOL_FLAGS+= --tag=disable-static
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.67
|
||||
@ -133,6 +132,8 @@ WANTLIB-main+= enchant gtkspell
|
||||
CONFIGURE_ARGS+= --disable-gtkspell
|
||||
.endif
|
||||
|
||||
ARCHIVE_DIR_LIST= finch gnt pidgin purple-2
|
||||
|
||||
post-extract:
|
||||
@cp ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libpurple/plugins/ssl
|
||||
|
||||
@ -147,7 +148,9 @@ post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pidgin
|
||||
${INSTALL_DATA} ${WRKSRC}/purple.service \
|
||||
${PREFIX}/share/dbus-1/services
|
||||
mv ${PREFIX}/lib/purple-2/libjabber.* ${PREFIX}/lib
|
||||
mv ${PREFIX}/lib/purple-2/liboscar.* ${PREFIX}/lib
|
||||
.for dir in ${ARCHIVE_DIR_LIST}
|
||||
@find ${PREFIX}/lib/${dir} -name '*.a' -print | xargs rm
|
||||
.endfor
|
||||
@find ${PREFIX}/lib -name '*.la' -print | xargs rm
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.24 2011/03/13 17:27:11 jasper Exp $
|
||||
--- configure.ac.orig Thu Mar 10 21:20:27 2011
|
||||
+++ configure.ac Fri Mar 11 18:59:03 2011
|
||||
$OpenBSD: patch-configure_ac,v 1.25 2011/07/07 08:28:04 dcoppa Exp $
|
||||
--- configure.ac.orig Fri Mar 11 03:20:27 2011
|
||||
+++ configure.ac Thu Jul 7 09:23:41 2011
|
||||
@@ -972,7 +972,7 @@ else
|
||||
if test "$ac_silc_libs" != "no"; then
|
||||
SILC_LIBS="-L$ac_silc_libs"
|
||||
@ -90,14 +90,14 @@ $OpenBSD: patch-configure_ac,v 1.24 2011/03/13 17:27:11 jasper Exp $
|
||||
+ *) with_openssl_libs="-L$with_openssl_libs" ;;
|
||||
+ esac
|
||||
+
|
||||
+ AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
|
||||
+ AC_CACHE_CHECK([for OpenSSL libraries], ac_cv_openssl_libs,
|
||||
+ [
|
||||
+ LIBS="$LIBS $with_openssl_libs -lssl -lcrypto"
|
||||
+ AC_TRY_LINK_FUNC(SSL_library_init, openssl_libs="yes", openssl_libs="no")
|
||||
+ AC_TRY_LINK_FUNC(SSL_library_init, ac_cv_openssl_libs="yes", ac_cv_openssl_libs="no")
|
||||
+ LIBS="$LIBS_save"
|
||||
+ ])
|
||||
+
|
||||
+ if test "x$openssl_libs" != "xno"; then
|
||||
+ if test "x$ac_cv_openssl_libs" != "xno"; then
|
||||
+ AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have OpenSSL])
|
||||
+ AC_DEFINE(HAVE_SSL)
|
||||
+ msg_openssl="OpenSSL"
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-libpurple_protocols_jabber_Makefile_in,v 1.1 2011/07/07 08:28:04 dcoppa Exp $
|
||||
--- libpurple/protocols/jabber/Makefile.in.orig Wed May 11 21:52:39 2011
|
||||
+++ libpurple/protocols/jabber/Makefile.in Wed May 11 21:53:49 2011
|
||||
@@ -138,7 +138,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
|
||||
libxmpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(libxmpp_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
-@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir)
|
||||
+@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.19 2011/07/07 08:28:04 dcoppa Exp $
|
||||
--- libpurple/protocols/oscar/Makefile.in.orig Wed May 11 21:54:19 2011
|
||||
+++ libpurple/protocols/oscar/Makefile.in Wed May 11 21:55:47 2011
|
||||
@@ -79,7 +79,7 @@ am__v_lt_0 = --silent
|
||||
libaim_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(libaim_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
-@STATIC_OSCAR_FALSE@am_libaim_la_rpath = -rpath $(pkgdir)
|
||||
+@STATIC_OSCAR_FALSE@am_libaim_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
|
||||
@STATIC_OSCAR_FALSE@libicq_la_DEPENDENCIES = liboscar.la
|
||||
am__libicq_la_SOURCES_DIST = libicq.c
|
||||
@STATIC_OSCAR_FALSE@am_libicq_la_OBJECTS = libicq.lo
|
||||
@@ -87,7 +87,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
|
||||
libicq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(libicq_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
-@STATIC_OSCAR_FALSE@am_libicq_la_rpath = -rpath $(pkgdir)
|
||||
+@STATIC_OSCAR_FALSE@am_libicq_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
|
||||
am__DEPENDENCIES_1 =
|
||||
@STATIC_OSCAR_FALSE@liboscar_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am__liboscar_la_SOURCES_DIST = authorization.c bstream.c clientlogin.c \
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-finch,v 1.4 2009/09/08 06:35:24 steven Exp $
|
||||
@comment $OpenBSD: PLIST-finch,v 1.5 2011/07/07 08:28:04 dcoppa Exp $
|
||||
@conflict pidgin-<2.5.6p3
|
||||
@pkgpath net/pidgin
|
||||
@bin bin/finch
|
||||
@ -52,24 +52,16 @@ include/gnt/gntwindow.h
|
||||
include/gnt/gntwm.h
|
||||
include/gnt/gntws.h
|
||||
lib/finch/
|
||||
lib/finch/gntclipboard.la
|
||||
lib/finch/gntclipboard.so
|
||||
lib/finch/gntgf.la
|
||||
lib/finch/gntgf.so
|
||||
lib/finch/gnthistory.la
|
||||
lib/finch/gnthistory.so
|
||||
lib/finch/gntlastlog.la
|
||||
lib/finch/gntlastlog.so
|
||||
lib/finch/gnttinyurl.la
|
||||
lib/finch/gnttinyurl.so
|
||||
lib/finch/grouping.la
|
||||
lib/finch/grouping.so
|
||||
lib/gnt/
|
||||
lib/gnt/irssi.la
|
||||
lib/gnt/irssi.so
|
||||
lib/gnt/s.la
|
||||
lib/gnt/s.so
|
||||
lib/libgnt.la
|
||||
lib/libgnt.a
|
||||
@lib lib/libgnt.so.${LIBgnt_VERSION}
|
||||
lib/pkgconfig/finch.pc
|
||||
lib/pkgconfig/gnt.pc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-libpurple,v 1.14 2011/03/06 14:13:20 steven Exp $
|
||||
@comment $OpenBSD: PLIST-libpurple,v 1.15 2011/07/07 08:28:04 dcoppa Exp $
|
||||
@conflict pidgin-<2.5.6p3
|
||||
@pkgpath net/pidgin
|
||||
@pkgpath net/pidgin,-libpurple,gtkspell
|
||||
@ -82,73 +82,42 @@ include/libpurple/value.h
|
||||
include/libpurple/version.h
|
||||
include/libpurple/whiteboard.h
|
||||
include/libpurple/xmlnode.h
|
||||
lib/libjabber.la
|
||||
@lib lib/libjabber.so.${LIBjabber_VERSION}
|
||||
lib/liboscar.la
|
||||
@lib lib/liboscar.so.${LIBoscar_VERSION}
|
||||
lib/libpurple-client.la
|
||||
lib/libpurple-client.a
|
||||
@lib lib/libpurple-client.so.${LIBpurple-client_VERSION}
|
||||
lib/libpurple.la
|
||||
lib/libpurple.a
|
||||
@lib lib/libpurple.so.${LIBpurple_VERSION}
|
||||
lib/pkgconfig/purple.pc
|
||||
lib/purple-2/
|
||||
lib/purple-2/autoaccept.la
|
||||
lib/purple-2/autoaccept.so
|
||||
lib/purple-2/buddynote.la
|
||||
lib/purple-2/buddynote.so
|
||||
lib/purple-2/dbus-example.la
|
||||
lib/purple-2/dbus-example.so
|
||||
lib/purple-2/idle.la
|
||||
lib/purple-2/idle.so
|
||||
lib/purple-2/joinpart.la
|
||||
lib/purple-2/joinpart.so
|
||||
lib/purple-2/libaim.la
|
||||
lib/purple-2/libaim.so
|
||||
lib/purple-2/libgg.la
|
||||
lib/purple-2/libgg.so
|
||||
lib/purple-2/libicq.la
|
||||
lib/purple-2/libicq.so
|
||||
lib/purple-2/libirc.la
|
||||
lib/purple-2/libirc.so
|
||||
lib/purple-2/libmsn.la
|
||||
@lib lib/purple-2/libjabber.so.${LIBjabber_VERSION}
|
||||
lib/purple-2/libmsn.so
|
||||
lib/purple-2/libmxit.la
|
||||
lib/purple-2/libmxit.so
|
||||
lib/purple-2/libmyspace.la
|
||||
lib/purple-2/libmyspace.so
|
||||
lib/purple-2/libnovell.la
|
||||
lib/purple-2/libnovell.so
|
||||
lib/purple-2/libqq.la
|
||||
@lib lib/purple-2/liboscar.so.${LIBoscar_VERSION}
|
||||
lib/purple-2/libqq.so
|
||||
lib/purple-2/libsametime.la
|
||||
lib/purple-2/libsametime.so
|
||||
lib/purple-2/libsilcpurple.la
|
||||
lib/purple-2/libsilcpurple.so
|
||||
lib/purple-2/libsimple.la
|
||||
lib/purple-2/libsimple.so
|
||||
lib/purple-2/libxmpp.la
|
||||
lib/purple-2/libxmpp.so
|
||||
lib/purple-2/libyahoo.la
|
||||
lib/purple-2/libyahoo.so
|
||||
lib/purple-2/libyahoojp.la
|
||||
lib/purple-2/libyahoojp.so
|
||||
lib/purple-2/libymsg.la
|
||||
@lib lib/purple-2/libymsg.so.${LIBymsg_VERSION}
|
||||
lib/purple-2/libzephyr.la
|
||||
lib/purple-2/libzephyr.so
|
||||
lib/purple-2/log_reader.la
|
||||
lib/purple-2/log_reader.so
|
||||
lib/purple-2/newline.la
|
||||
lib/purple-2/newline.so
|
||||
lib/purple-2/offlinemsg.la
|
||||
lib/purple-2/offlinemsg.so
|
||||
lib/purple-2/psychic.la
|
||||
lib/purple-2/psychic.so
|
||||
lib/purple-2/ssl-openssl.la
|
||||
lib/purple-2/ssl-openssl.so
|
||||
lib/purple-2/ssl.la
|
||||
lib/purple-2/ssl.so
|
||||
lib/purple-2/statenotify.la
|
||||
lib/purple-2/statenotify.so
|
||||
share/aclocal/purple.m4
|
||||
share/dbus-1/services/purple.service
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.11 2011/01/13 10:29:27 jasper Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.12 2011/07/07 08:28:04 dcoppa Exp $
|
||||
@conflict gaim-*
|
||||
@conflict pidgin-facebookchat-<1.68p0
|
||||
@pkgpath net/pidgin
|
||||
@ -55,43 +55,24 @@ include/pidgin/pidgin.h
|
||||
include/pidgin/pidginstock.h
|
||||
include/pidgin/pidgintooltip.h
|
||||
lib/pidgin/
|
||||
lib/pidgin/convcolors.la
|
||||
lib/pidgin/convcolors.so
|
||||
lib/pidgin/extplacement.la
|
||||
lib/pidgin/extplacement.so
|
||||
lib/pidgin/gestures.la
|
||||
lib/pidgin/gestures.so
|
||||
lib/pidgin/gtkbuddynote.la
|
||||
lib/pidgin/gtkbuddynote.so
|
||||
lib/pidgin/history.la
|
||||
lib/pidgin/history.so
|
||||
lib/pidgin/iconaway.la
|
||||
lib/pidgin/iconaway.so
|
||||
lib/pidgin/markerline.la
|
||||
lib/pidgin/markerline.so
|
||||
lib/pidgin/musicmessaging.la
|
||||
lib/pidgin/musicmessaging.so
|
||||
lib/pidgin/notify.la
|
||||
lib/pidgin/notify.so
|
||||
lib/pidgin/pidginrc.la
|
||||
lib/pidgin/pidginrc.so
|
||||
lib/pidgin/relnot.la
|
||||
lib/pidgin/relnot.so
|
||||
lib/pidgin/sendbutton.la
|
||||
lib/pidgin/sendbutton.so
|
||||
lib/pidgin/spellchk.la
|
||||
lib/pidgin/spellchk.so
|
||||
lib/pidgin/themeedit.la
|
||||
lib/pidgin/themeedit.so
|
||||
lib/pidgin/ticker.la
|
||||
lib/pidgin/ticker.so
|
||||
lib/pidgin/timestamp.la
|
||||
lib/pidgin/timestamp.so
|
||||
lib/pidgin/timestamp_format.la
|
||||
lib/pidgin/timestamp_format.so
|
||||
lib/pidgin/xmppconsole.la
|
||||
lib/pidgin/xmppconsole.so
|
||||
lib/pidgin/xmppdisco.la
|
||||
lib/pidgin/xmppdisco.so
|
||||
lib/pkgconfig/pidgin.pc
|
||||
@man man/man1/pidgin.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user