buildlink1 -> buildlink2, and use faces instead of compface if it's

installed.

2 files changed, 44 insertions, 29 deletions

diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 9ae6ba2fa3f..c721e06a32a 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/22 05:13:37 grant Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/24 21:58:44 jlam Exp $
 
 DISTNAME=	sylpheed-0.8.1claws
 PKGNAME=	sylpheed-claws-0.8.1
@@ -10,20 +10,24 @@ MAINTAINER=	ptiJo@noos.fr
 HOMEPAGE=	http://sylpheed-claws.sourceforge.net/
 COMMENT=	X based e-mail and netnews client
 
-CONFLICTS=	sylpheed-*
+CONFLICTS=	sylpheed-[0-9]*
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
+USE_GMAKE=		yes
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-compface
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+BUILDLINK_DEPENDS.gpgme=	gpgme>=0.3.5
+BUILDLINK_DEPENDS.compface=	{compface>=1.4,faces>=1.6.1nb1}
+
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=		USE_INET6
 
@@ -31,13 +35,18 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-SUPPORT_FILES=		${FILESDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+SUPPORT_FILES=	${FILESDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+
+FACES_IS_INSTALLED!=	${PKG_INFO} -e faces || ${ECHO}
+.if empty(FACES_IS_INSTALLED)
+.  include "../../graphics/compface/buildlink2.mk"
+.else
+.  include "../../mail/faces/buildlink2.mk"
+.endif
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../security/gpgme/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 
-.include "../../graphics/compface/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../security/gpgme/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 354816e206f..812675a99ac 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.21 2002/09/17 23:35:15 mjl Exp $
+# $NetBSD: Makefile,v 1.22 2002/09/24 21:58:43 jlam Exp $
 
-DISTNAME=		sylpheed-0.8.3
-# PKGREVISION=		2
-CATEGORIES=		mail news x11
-MASTER_SITES=		http://sylpheed.good-day.net/sylpheed/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	sylpheed-0.8.3
+#PKGREVISION=	2
+CATEGORIES=	mail news x11
+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://sylpheed.good-day.net/index.cgi.en
 COMMENT=	X based e-mail and netnews client
 
-CONFLICTS=	sylpheed-claws-*
+CONFLICTS=	sylpheed-claws-[0-9]*
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
+USE_GMAKE=		yes
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-ssl
@@ -24,7 +25,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-compface
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-BUILDLINK_DEPENDS.gpgme=	gpgme>=0.3.5:../../security/gpgme
+BUILDLINK_DEPENDS.gpgme=	gpgme>=0.3.5
 
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=		USE_INET6
@@ -33,11 +34,16 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.include "../../graphics/compface/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../security/gpgme/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
-.include "../../mk/bsd.pkg.install.mk"
+FACES_IS_INSTALLED!=	${PKG_INFO} -e faces || ${ECHO}
+.if empty(FACES_IS_INSTALLED)
+.  include "../../graphics/compface/buildlink2.mk"
+.else
+.  include "../../mail/faces/buildlink2.mk"
+.endif
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../security/gpgme/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"