diff options
Diffstat (limited to 'mail/evolution')
| -rw-r--r-- | mail/evolution/Makefile | 42 | ||||
| -rw-r--r-- | mail/evolution/distinfo | 10 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-aa | 12 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-am | 18 | ||||
| -rw-r--r-- | mail/evolution/pkg/PLIST | 3 |
5 files changed, 46 insertions, 39 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 226d6d04589..d578602c283 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2001/10/05 22:47:33 tron Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/06 14:44:01 rh Exp $ -DISTNAME= evolution-0.14 +DISTNAME= evolution-0.15 CATEGORIES= mail time gnome MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/evolution/} EXTRACT_SUFX= .tar.bz2 @@ -9,26 +9,17 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.ximian.com/products/ximian_evolution/ COMMENT= GNOME mailer, calendar, contact manager, and communications tool -BUILD_DEPENDS+= automake>=1.4:../../devel/automake - -DEPENDS+= bison-[0-9]*:../../devel/bison -DEPENDS+= db3-2.9:../../databases/db3 -DEPENDS+= gal>=0.12:../../devel/gal -DEPENDS+= bonobo>=1.0.7:../../devel/bonobo +BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison DEPENDS+= bonobo-conf>=0.11:../../devel/bonobo-conf -DEPENDS+= gtkhtml>=0.13.0:../../www/gtkhtml -DEPENDS+= gnome-vfs>=1.0.1:../../sysutils/gnome-vfs -DEPENDS+= libunicode>=0.4:../../textproc/libunicode -DEPENDS+= oaf>=0.6.5:../../devel/oaf -DEPENDS+= ORBit>=0.5.8:../../net/ORBit -DEPENDS+= gnome-print>=0.29:../../print/gnome-print -DEPENDS+= gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf BUILD_USES_MSGFMT= YES +BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0 +BUILDLINK_DEPENDS.gdk-pixbuf-gnome= gdk-pixbuf-gnome>=0.9.0 +BUILDLINK_DEPENDS.db3= db3-2.9 + GNU_CONFIGURE= YES USE_GMAKE= YES USE_X11BASE= YES -USE_LIBINTL= YES USE_LIBTOOL= YES YACC= ${PREFIX}/bin/bison -y @@ -40,9 +31,24 @@ CONFIGURE_ENV+= CFLAGS="-D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}" CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/automake) - + for i in ${WRKSRC}/widgets/*/Makefile.in \ + ${WRKSRC}/mail/*/Makefile.in \ + ${WRKSRC}/shell/*/Makefile.in ; do \ + ${SED} <$$i >$$i.fixed \ + -e 's/^\(LTCOMPILE.*\)$$/\1 $${BONOBO_GNOME_CFLAGS}/' \ + -e 's/^\(COMPILE.*\)$$/\1 $${BONOBO_GNOME_CFLAGS}/' && \ + ${MV} $$i.fixed $$i ; \ + done + +.include "../../textproc/libunicode/buildlink.mk" +.include "../../sysutils/gnome-vfs/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../print/gnome-print/buildlink.mk" .include "../../security/openssl/buildlink.mk" .include "../../databases/db3/buildlink.mk" +.include "../../www/gtkhtml/buildlink.mk" .include "../../devel/bonobo/buildlink.mk" +.include "../../devel/oaf/buildlink.mk" +.include "../../devel/gal/buildlink.mk" +.include "../../net/ORBit/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index fdc84322b00..0cfdff681b6 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2001/09/29 17:43:55 rh Exp $ +$NetBSD: distinfo,v 1.7 2001/10/06 14:44:02 rh Exp $ -SHA1 (evolution-0.14.tar.bz2) = daa858cba933c38ae90c8e4cda1363d0b624f38b -Size (evolution-0.14.tar.bz2) = 7278567 bytes -SHA1 (patch-aa) = b95e7ab2f12cf76b1685a3d0381145c220dad95d +SHA1 (evolution-0.15.tar.bz2) = a7a84603fbd8a2fb83c1dbf9211ad65ff32c0b41 +Size (evolution-0.15.tar.bz2) = 7425779 bytes +SHA1 (patch-aa) = dc22260fb882a75a5a38912b2a1c628887e190fa SHA1 (patch-ab) = 6c3ed264bccf90052c843c2ef1f4b4ee89997770 SHA1 (patch-ac) = 9a67ed544cd6894c0387a2b185fcb41ec59a7329 SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e @@ -13,4 +13,4 @@ SHA1 (patch-ah) = 36662bab9902e7a09f0e56b820beb2d6af03994b SHA1 (patch-ai) = 7f6b9212a482fcb1230b1e920daa58aef678b15d SHA1 (patch-aj) = 9b24098b338af3eff7e2f2f46d6817e7cf5cd510 SHA1 (patch-ak) = 1f367591284d27beeecd8c9f9308ca77dda8f7fb -SHA1 (patch-am) = 4c6b3e83efe66feb42a2d7eddce9d4e34593efa8 +SHA1 (patch-am) = cb4f30e91f7575acc411fc14edb8fff1c494cd2d diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa index 4223e9c869a..ff791f3f48f 100644 --- a/mail/evolution/patches/patch-aa +++ b/mail/evolution/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.5 2001/09/29 17:43:55 rh Exp $ +$NetBSD: patch-aa,v 1.6 2001/10/06 14:44:02 rh Exp $ ---- configure.orig Sat Sep 22 00:22:38 2001 +--- configure.orig Wed Oct 3 00:12:24 2001 +++ configure -@@ -8364,13 +8364,13 @@ - if { (eval echo configure:8365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -8366,13 +8366,13 @@ + if { (eval echo configure:8367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo - DATADIRNAME=share @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/29 17:43:55 rh Exp $ fi rm -f conftest* INSTOBJEXT=.mo -@@ -8599,7 +8599,7 @@ +@@ -8601,7 +8601,7 @@ # We need to process the po/ directory. POSUB=po else @@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/29 17:43:55 rh Exp $ nls_cv_header_intl=intl/libintl.h nls_cv_header_libgt=intl/libgettext.h fi -@@ -9195,8 +9195,8 @@ +@@ -9197,8 +9197,8 @@ # This can only change between Evolution versions (and then can only # go up.) evolution_db_version_major=3 diff --git a/mail/evolution/patches/patch-am b/mail/evolution/patches/patch-am index a505c4d8e47..0f26bfc2b09 100644 --- a/mail/evolution/patches/patch-am +++ b/mail/evolution/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.1 2001/09/24 04:02:30 mycroft Exp $ +$NetBSD: patch-am,v 1.2 2001/10/06 14:44:02 rh Exp $ ---- libibex/Makefile.am.orig Sun Sep 23 23:38:35 2001 -+++ libibex/Makefile.am Sun Sep 23 23:38:42 2001 -@@ -9,8 +9,6 @@ - disktail.c \ - ibex_block.c +--- libibex/Makefile.in.orig Wed Oct 3 00:14:00 2001 ++++ libibex/Makefile.in +@@ -189,7 +189,7 @@ + libibex_la_SOURCES = wordindexmem.c block.c ibex.h hash.c disktail.c ibex_block.c + -libibex_la_LDFLAGS = -static -- - libibex_la_LIBADD = \ - $(GAL_LIBS) ++libibex_la_LDFLAGS = + + libibex_la_LIBADD = $(GAL_LIBS) diff --git a/mail/evolution/pkg/PLIST b/mail/evolution/pkg/PLIST index a1605369ecf..7734a6660eb 100644 --- a/mail/evolution/pkg/PLIST +++ b/mail/evolution/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2001/09/29 17:43:56 rh Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/10/06 14:44:03 rh Exp $ bin/evolution bin/evolution-addressbook bin/evolution-alarm-notify @@ -757,6 +757,7 @@ share/images/evolution/service-up.png share/images/evolution/show_all_messages.xpm share/images/evolution/splash.png share/images/evolution/talking-heads.png +share/images/evolution/task.png share/images/evolution/task.xpm share/images/evolution/thankyou.png share/images/evolution/timezone-16.xpm |