summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/GNUMail/Makefile3
-rw-r--r--mail/balsa2/Makefile3
-rw-r--r--mail/bbmail/Makefile5
-rw-r--r--mail/coolmail/Makefile4
-rw-r--r--mail/evolution/Makefile3
-rw-r--r--mail/evolution14/Makefile3
-rw-r--r--mail/exmh/Makefile5
-rw-r--r--mail/faces/Makefile3
-rw-r--r--mail/fetchmailconf/Makefile3
-rw-r--r--mail/libmilter/builtin.mk56
-rw-r--r--mail/libmilter812/builtin.mk56
-rw-r--r--mail/spruce/Makefile3
-rw-r--r--mail/sylpheed-claws/Makefile.common5
-rw-r--r--mail/sylpheed-devel/Makefile3
-rw-r--r--mail/sylpheed/Makefile3
-rw-r--r--mail/wmbiff/Makefile3
-rw-r--r--mail/wmmail/Makefile3
-rw-r--r--mail/xbuffy/Makefile4
18 files changed, 106 insertions, 62 deletions
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index 3cde8164134..48eaaece9ff 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:59 jlam Exp $
#
DISTNAME= GNUMail-1.1.2
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.collaboration-world.com/gnumail/
COMMENT= GNUstep clone of NeXT's Mail.app application
WRKSRC= ${WRKDIR}/GNUMail
-USE_X11= yes
NO_CONFIGURE= yes
post-extract:
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 1f5611cbef5..6a22e546064 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:59 jlam Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 1
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PERL5= build
-USE_X11= yes
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index ae88d780900..6388bf62f07 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:59 jlam Exp $
#
DISTNAME= bbmail-0.8.3
@@ -10,9 +10,10 @@ HOMEPAGE= http://bbtools.windsofstorm.net/
COMMENT= Mailbox monitor (not only) for the blackbox windowmanager
GNU_CONFIGURE= YES
-USE_X11= YES
USE_LANGUAGES= c++
+.include "../../mk/x11.buildlink3.mk"
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/man/man1/
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 4f23ce6348b..d9d3e238c2e 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:56:43 martti Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:59 jlam Exp $
DISTNAME= coolmail-1.3
CATEGORIES= mail x11
@@ -11,6 +11,8 @@ COMMENT= Xbiff replacement with 3D animation and sound
MAKE_ENV+= X11BASE=${PREFIX}
USE_X11BASE= yes
+.include "../../mk/x11.buildlink3.mk"
+
post-install:
${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
${PREFIX}/lib/X11/app-defaults/Coolmail
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9c79eae7cef..d42af2aa0d4 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/05/31 19:44:15 rillig Exp $
+# $NetBSD: Makefile,v 1.83 2005/06/01 18:02:59 jlam Exp $
DISTNAME= evolution-2.2.2
CATEGORIES= mail time gnome
@@ -28,7 +28,6 @@ PKG_FAIL_REASON= "Kerberos support conflicts with SSL"
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_TOOLS+= bison gmake
-USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index b945fbaf8e8..af0426a5422 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 14:47:54 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:59 jlam Exp $
DISTNAME= evolution-1.4.6
PKGNAME= ${DISTNAME:S/evolution/evolution14/}
@@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.db3= db3-3.11.2{,nb*}
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_TOOLS+= bison gmake
-USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index f7be2c1ca70..f271aeab360 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/03/24 21:12:55 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:59 jlam Exp $
DISTNAME= exmh-2.6.3
CATEGORIES= mail tk
@@ -15,7 +15,6 @@ DEPENDS+= metamail>=2.7:../../mail/metamail
.include "../../mk/bsd.prefs.mk"
DIST_SUBDIR= ${PKGNAME}
-USE_X11= yes
WISH= wish
TCLSH= tclsh
@@ -28,6 +27,8 @@ TCLSH= tclsh
# mail/faces
# audio/rplay
+.include "../../mk/x11.buildlink3.mk"
+
do-build:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 434511bf6a8..0f4ac45a227 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:59 jlam Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 3
@@ -61,4 +61,5 @@ do-configure:
done
.include "../../lang/perl5/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 47ebd689b4e..867d45fe71c 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.63 2005/06/01 18:02:59 jlam Exp $
DISTNAME= fetchmail-6.2.5
PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -14,7 +14,6 @@ COMMENT= Configuration tool for fetchmail
DEPENDS+= ${DISTNAME}{,nb*}:../../mail/fetchmail
NO_BUILD= YES
-USE_X11= YES
DISTINFO_FILE= ${.CURDIR}/../../mail/fetchmail/distinfo
PATCHDIR= ${.CURDIR}/../../mail/fetchmail/patches
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
index 57b3b9574e7..8f314ba5540 100644
--- a/mail/libmilter/builtin.mk
+++ b/mail/libmilter/builtin.mk
@@ -1,27 +1,49 @@
-# $NetBSD: builtin.mk,v 1.2 2004/07/18 15:41:35 tron Exp $
+# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:59 jlam Exp $
+BUILTIN_PKG:= libmilter
+
+BUILTIN_FIND_LIBS:= milter
+BUILTIN_FIND_FILES_VAR:= H_LIBMILTER
+BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
.if !defined(IS_BUILTIN.libmilter)
IS_BUILTIN.libmilter= no
-. if exists(/usr/include/libmilter) && exists (/usr/lib/libmilter.a)
+. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \
+ !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS])
IS_BUILTIN.libmilter= yes
. endif
-.endif # IS_BUILTIN.libmilter
+.endif
+MAKEVARS+= IS_BUILTIN.libmilter
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
.if !defined(USE_BUILTIN.libmilter)
-USE_BUILTIN.libmilter?= ${IS_BUILTIN.libmilter}
-
-. if defined(BUILTIN_PKG.libmilter)
+. if ${PREFER.libmilter} == "pkgsrc"
+USE_BUILTIN.libmilter= no
+. else
+USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter}
+. if defined(BUILTIN_PKG.libmilter) && \
+ !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter= yes
-. for _depend_ in ${BUILDLINK_DEPENDS.libmilter}
-. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
-USE_BUILTIN.libmilter!= \
- if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libmilter}; then \
- ${ECHO} "yes"; \
+. for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
+USE_BUILTIN.libmilter!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
+ ${ECHO} yes; \
else \
- ${ECHO} "no"; \
+ ${ECHO} no; \
fi
-. endif
-. endfor
-. endif
-.endif # USE_BUILTIN.libmilter
-
+. endif
+. endfor
+. endif
+. endif # PREFER.libmilter
+.endif
+MAKEVARS+= USE_BUILTIN.libmilter
diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk
index 09de8120c04..9743d3e3766 100644
--- a/mail/libmilter812/builtin.mk
+++ b/mail/libmilter812/builtin.mk
@@ -1,27 +1,49 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2004/08/30 20:53:20 adrianp Exp $
+# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:02:59 jlam Exp $
+BUILTIN_PKG:= libmilter
+
+BUILTIN_FIND_LIBS:= milter
+BUILTIN_FIND_FILES_VAR:= H_LIBMILTER
+BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
.if !defined(IS_BUILTIN.libmilter)
IS_BUILTIN.libmilter= no
-. if exists(/usr/include/libmilter) && exists (/usr/lib/libmilter.a)
+. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \
+ !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS])
IS_BUILTIN.libmilter= yes
. endif
-.endif # IS_BUILTIN.libmilter
+.endif
+MAKEVARS+= IS_BUILTIN.libmilter
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
.if !defined(USE_BUILTIN.libmilter)
-USE_BUILTIN.libmilter?= ${IS_BUILTIN.libmilter}
-
-. if defined(BUILTIN_PKG.libmilter)
+. if ${PREFER.libmilter} == "pkgsrc"
+USE_BUILTIN.libmilter= no
+. else
+USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter}
+. if defined(BUILTIN_PKG.libmilter) && \
+ !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter= yes
-. for _depend_ in ${BUILDLINK_DEPENDS.libmilter}
-. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
-USE_BUILTIN.libmilter!= \
- if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libmilter}; then \
- ${ECHO} "yes"; \
+. for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
+USE_BUILTIN.libmilter!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
+ ${ECHO} yes; \
else \
- ${ECHO} "no"; \
+ ${ECHO} no; \
fi
-. endif
-. endfor
-. endif
-.endif # USE_BUILTIN.libmilter
-
+. endif
+. endfor
+. endif
+. endif # PREFER.libmilter
+.endif
+MAKEVARS+= USE_BUILTIN.libmilter
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 4fac3aafcf5..c79fb1a2253 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:59 jlam Exp $
#
DISTNAME= spruce-0.5.17
@@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://spruce.sourceforge.net/
COMMENT= MIME-aware, GNOME-based email program
-USE_X11= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index cd5f5c30154..5f261391951 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/06/01 18:03:00 jlam Exp $
DISTNAME= sylpheed-claws-${SYLPHEED_VERSION}
CATEGORIES= mail news x11
@@ -13,10 +13,11 @@ PATCHDIR= ${.CURDIR}/../../mail/sylpheed-claws/patches
USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_X11= YES
GNU_CONFIGURE= YES
# Force gnome detection off to avoid installing some extra files
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no"
SYLPHEED_VERSION= 1.0.4
+
+.include "../../mk/x11.buildlink3.mk"
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index 94bd738bf6a..e74b89862db 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/29 14:45:27 chris Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:00 jlam Exp $
DISTNAME= sylpheed-1.9.12
CATEGORIES= mail news x11
@@ -18,7 +18,6 @@ CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_X11= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 34c2c4eabcd..c139a6677a8 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.77 2005/06/01 18:03:00 jlam Exp $
DISTNAME= sylpheed-1.0.4
CATEGORIES= mail news x11
@@ -16,7 +16,6 @@ CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_X11= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index a9205a5de82..ac61704098e 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:00 jlam Exp $
DISTNAME= wmbiff-0.4.25
PKGREVISION= 1
@@ -10,7 +10,6 @@ HOMEPAGE= http://sourceforge.net/projects/wmbiff/
COMMENT= xbuffy like "mail-checker" for WindowMaker
GNU_CONFIGURE= YES
-USE_X11= YES
USE_TOOLS+= gmake
EX_DIR= ${PREFIX}/share/examples/wmbiff
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 9e4c966ee7a..cfdf35e8559 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/01 18:03:00 jlam Exp $
DISTNAME= WMMail.app-0.64
PKGNAME= wmmail-0.64
@@ -19,4 +19,5 @@ CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \
--with-PL-libs="-L${LOCALBASE}/lib"
.include "../../devel/libproplist/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 9204c9b0b42..fc21957358c 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:56:57 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:00 jlam Exp $
#
DISTNAME= xbuffy-3.4
@@ -14,6 +14,8 @@ USE_X11BASE= YES
CPPFLAGS+= -I${X11BASE}/include
CPPFLAGS+= -Wall
+.include "../../mk/x11.buildlink3.mk"
+
post-install:
${INSTALL_DATA} ${WRKSRC}/XBuffy.ad ${PREFIX}/lib/X11/app-defaults/XBuffy
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 18:01:52 +0000