summaryrefslogtreecommitdiff
path: root/chat/pidgin-silc
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2010-08-30 11:18:01 +0000
committeradam <adam@pkgsrc.org>2010-08-30 11:18:01 +0000
commit932e77d62531cb720dcf29a35f166ba7ede843b3 (patch)
tree80ffddb91a43fb07886d96c307a3439198cd353e /chat/pidgin-silc
parent2e84b66c61fa2eb16331547ca2d86d794a82f4ea (diff)
downloadpkgsrc-932e77d62531cb720dcf29a35f166ba7ede843b3.tar.gz
Changes 2.7.3:
* Lots of little incremental bug fixes and enhancements in this release. * Finally got some fixes out there for you Yahoo users behind some particularly annoying firewalls and proxies, among other fixes. Enjoy! Changes 2.7.2: * We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and decided to release a patched version quickly. This release contains the fix for that crash, and a few other minor fixes.
Diffstat (limited to 'chat/pidgin-silc')
-rw-r--r--chat/pidgin-silc/Makefile40
1 files changed, 4 insertions, 36 deletions
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index e618366f1f6..aaf5c27544f 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:58 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2010/08/30 11:18:02 adam Exp $
-PKGNAME= pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION= 2
-COMMENT= SILC plugin for the Pidgin instant messenger
+PKGNAME= pidgin-silc-${PIDGIN_VERSION}
+COMMENT= SILC plugin for the Pidgin instant messenger
PKG_DESTDIR_SUPPORT= user-destdir
@@ -13,42 +11,12 @@ USE_TOOLS+= msgfmt perl intltool
BUILD_DIRS= libpurple/protocols/silc
-# Because pkgsrc's silc-toolkit is too old, we have to jump through some very,
-# very, VERY nasty hoops to build this package. Hopefully this hack can be
-# removed soon.
-
-BUNDLE_SILC=yes
-.if defined(BUNDLE_SILC)
-
-DISTINFO_FILE= ${.CURDIR}/../../chat/pidgin-silc/distinfo
-SITES.silc-toolkit-1.1.7.tar.gz= \
- http://www.silcnet.org/download/toolkit/sources/
-DISTFILES+= pidgin-${PIDGIN_VERSION}.tar.bz2 silc-toolkit-1.1.7.tar.gz
-CFLAGS+= -fPIC
-pre-configure:
- # Build libsilc statically and install it into the buildlink dir
- cd ${WRKDIR}/silc-toolkit-1.1.7 && ${SETENV} ${CONFIGURE_ENV} \
- ./configure --disable-asm --enable-static --disable-shared \
- --without-libtoolfix --prefix=${BUILDLINK_DIR} && \
- ${SETENV} ${MAKE_ENV} gmake && \
- ${SETENV} ${MAKE_ENV} gmake install && \
- cp ${WRKDIR}/silc-toolkit-1.1.7/lib/.libs/*.a \
- ${WRKSRC}/libpurple/protocols/silc
-
-SUBST_CLASSES+= linkage
-SUBST_STAGE.linkage= post-configure
-SUBST_MESSAGE.linkage= Fixing static linkage
-SUBST_FILES.linkage= libpurple/protocols/silc/Makefile
-SUBST_SED.linkage= -e 's/-lsilcclient -lsilc/-Wl,--whole-archive,libsilcclient.a,libsilc.a,--no-whole-archive/'
-
-.endif
-
BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../chat/libpurple/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
-#.include "../../devel/silc-toolkit/buildlink3.mk"
+.include "../../devel/silc-toolkit/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"