diff options
| author | dsainty <dsainty@pkgsrc.org> | 2008-11-12 11:44:29 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2008-11-12 11:44:29 +0000 |
| commit | 9349b69287dd07cd0cdae2ce1a267e38cbfedfa5 (patch) | |
| tree | bec41b763b7e36b232c33c6bdf208659dbb7bb9b /net/ekiga | |
| parent | 5fe81fde339896ffba1a19564ebfdb3f8d222671 (diff) | |
| download | pkgsrc-9349b69287dd07cd0cdae2ce1a267e38cbfedfa5.tar.gz | |
Ekiga wants LDAP support by default. Buildlink in databases/openldap-client
so that configure will succeed. Fix the comment syntax in a couple of
assembly files to fix the build where the assembler doesn't like # as a comment
prefix.
Bump PKGREVISION.
Diffstat (limited to 'net/ekiga')
| -rw-r--r-- | net/ekiga/Makefile | 5 | ||||
| -rw-r--r-- | net/ekiga/distinfo | 4 | ||||
| -rw-r--r-- | net/ekiga/patches/patch-aa | 24 | ||||
| -rw-r--r-- | net/ekiga/patches/patch-ab | 17 |
4 files changed, 48 insertions, 2 deletions
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index ce44e9d8fde..572b5603681 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/10/25 18:15:46 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/12 11:44:29 dsainty Exp $ # DISTNAME= ekiga-3.0.1 +PKGREVISION= 1 COMMENT= VoIP and video conferencing application for GNOME CATEGORIES= net comms MAINTAINER= pkgsrc-users@NetBSD.org @@ -16,6 +17,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --disable-avahi +CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client:Q} GCONF_SCHEMAS= ekiga.schemas @@ -23,6 +25,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ +.include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo index 066f7026043..c265cf3fe26 100644 --- a/net/ekiga/distinfo +++ b/net/ekiga/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2008/10/25 18:15:46 jmcneill Exp $ +$NetBSD: distinfo,v 1.3 2008/11/12 11:44:29 dsainty Exp $ SHA1 (ekiga-3.0.1.tar.bz2) = 96c0dea54c58206c00bd193e6ab5924abc1acb67 RMD160 (ekiga-3.0.1.tar.bz2) = 22868916a07842088c8c5351df103b5969a74137 Size (ekiga-3.0.1.tar.bz2) = 7780111 bytes +SHA1 (patch-aa) = 4caaec49ea8a663255e3db98fb4f7de15746da80 +SHA1 (patch-ab) = 08d3c1f6c9266bdb74c92e47a21b25f5df294fa6 diff --git a/net/ekiga/patches/patch-aa b/net/ekiga/patches/patch-aa new file mode 100644 index 00000000000..c22e1828b46 --- /dev/null +++ b/net/ekiga/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 2008/11/12 11:44:29 dsainty Exp $ + +Hash is a directive prefix - comment out the comments. + +--- lib/pixops/have_mmx.S.orig 2008-10-01 14:04:34.155963777 +1300 ++++ lib/pixops/have_mmx.S 2008-10-01 14:05:04.806426133 +1300 +@@ -42,7 +42,7 @@ + + push %ebx + +-# Check if bit 21 in flags word is writeable ++/* Check if bit 21 in flags word is writeable */ + + pushfl + popl %eax +@@ -57,7 +57,7 @@ + + je .notfound + +-# OK, we have CPUID ++/* OK, we have CPUID */ + + movl $1, %eax + cpuid diff --git a/net/ekiga/patches/patch-ab b/net/ekiga/patches/patch-ab new file mode 100644 index 00000000000..db4056289d9 --- /dev/null +++ b/net/ekiga/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1 2008/11/12 11:44:29 dsainty Exp $ + +Hash is a directive prefix - comment out the comments. + +--- lib/pixops/composite_line_22_4a4_mmx.S.orig 2008-10-01 15:21:01.215158522 +1300 ++++ lib/pixops/composite_line_22_4a4_mmx.S 2008-10-01 15:21:39.685738842 +1300 +@@ -189,8 +189,8 @@ + + shll $2, %edx + +-# %mm4 will always be already clear here +-# pxor %mm4, %mm4 ++/* %mm4 will always be already clear here ++ pxor %mm4, %mm4 */ + + movl 16(%ebp),%edi + movl (%edi, %edx), %eax |