From a0b50a35a392b15d98d035e034845e7d775845f4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 12 Oct 2006 20:41:28 +0000 Subject: Remove libmilter812; libmilter (based on 8.13) is just fine for pkgsrc dependents. --- mail/Makefile | 3 +-- mail/libmilter812/DESCR | 5 ----- mail/libmilter812/Makefile | 24 -------------------- mail/libmilter812/PLIST | 5 ----- mail/libmilter812/buildlink3.mk | 24 -------------------- mail/libmilter812/builtin.mk | 50 ----------------------------------------- mail/libmilter812/options.mk | 13 ----------- 7 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 mail/libmilter812/DESCR delete mode 100644 mail/libmilter812/Makefile delete mode 100644 mail/libmilter812/PLIST delete mode 100644 mail/libmilter812/buildlink3.mk delete mode 100644 mail/libmilter812/builtin.mk delete mode 100644 mail/libmilter812/options.mk diff --git a/mail/Makefile b/mail/Makefile index 20b47309b61..f0809551118 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.294 2006/10/07 05:20:12 uebayasi Exp $ +# $NetBSD: Makefile,v 1.295 2006/10/12 20:41:28 tv Exp $ # COMMENT= Electronic mail utilities @@ -81,7 +81,6 @@ SUBDIR+= kbiff SUBDIR+= libesmtp SUBDIR+= libetpan SUBDIR+= libmilter -SUBDIR+= libmilter812 SUBDIR+= libspf-alt SUBDIR+= mail-notification SUBDIR+= mailagent diff --git a/mail/libmilter812/DESCR b/mail/libmilter812/DESCR deleted file mode 100644 index 9b02bc1d1b2..00000000000 --- a/mail/libmilter812/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -The sendmail Mail Filter API (Milter) is designed to allow third-party -programs access to mail messages as they are being processed in order to -filter meta-information and content. - -libmilter provides the implementation of this API. diff --git a/mail/libmilter812/Makefile b/mail/libmilter812/Makefile deleted file mode 100644 index 60980643eb8..00000000000 --- a/mail/libmilter812/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2005/08/01 14:54:33 wiz Exp $ - -.include "options.mk" -.include "../../mail/sendmail812/Makefile.common" - -PKGNAME= libmilter-${DIST_VERS} -COMMENT= Mail filter support library for sendmail - -post-patch: make-sendmail-siteconfig - ${ECHO} >>${DESCR_SRC} - -do-build: - @(cd ${WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ./Build) - -do-install: - @(cd ${WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ./Build INCLUDEDIR=${PREFIX}/include LIBDIR=${PREFIX}/lib install) - -PTHREAD_OPTS+= require - -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" - -# has to be below include for bsd.pkg.mk, else substition fails -OBJDIR!= ${ECHO} obj.`${UNAME} -srm | ${TR} \ .` diff --git a/mail/libmilter812/PLIST b/mail/libmilter812/PLIST deleted file mode 100644 index cfcb2cf5b13..00000000000 --- a/mail/libmilter812/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/30 20:53:20 adrianp Exp $ -include/libmilter/mfapi.h -include/libmilter/mfdef.h -lib/libmilter.a -@dirrm include/libmilter diff --git a/mail/libmilter812/buildlink3.mk b/mail/libmilter812/buildlink3.mk deleted file mode 100644 index ce881b4f77c..00000000000 --- a/mail/libmilter812/buildlink3.mk +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:57 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMILTER_BUILDLINK3_MK:= ${LIBMILTER_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmilter -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmilter} -BUILDLINK_PACKAGES+= libmilter -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmilter - -.if !empty(LIBMILTER_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.12.9nb1 -BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter812 -BUILDLINK_DEPMETHOD.libmilter?= build - -PTHREAD_OPTS+= require -.endif # LIBMILTER_BUILDLINK3_MK - -.include "../../mk/pthread.buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk deleted file mode 100644 index 2a3d6e239eb..00000000000 --- a/mail/libmilter812/builtin.mk +++ /dev/null @@ -1,50 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:18 reed 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. appropriately ("yes" or "no"). -### -.if !defined(IS_BUILTIN.libmilter) -IS_BUILTIN.libmilter= no -. if empty(H_LIBMILTER:M__nonexistent__) && \ - empty(H_LIBMILTER:M${LOCALBASE}/*) && \ - !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS]) -IS_BUILTIN.libmilter= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.libmilter - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.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 _dep_ in ${BUILDLINK_API_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; \ - fi -. endif -. endfor -. endif -. endif # PREFER.libmilter -.endif -MAKEVARS+= USE_BUILTIN.libmilter diff --git a/mail/libmilter812/options.mk b/mail/libmilter812/options.mk deleted file mode 100644 index 5d623733bd4..00000000000 --- a/mail/libmilter812/options.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2005/08/01 14:54:33 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.libmilter812 -# just needed for Makefile.common to work -PKG_SUPPORTED_OPTIONS= inet6 - -.include "../../mk/bsd.options.mk" - -### -### IPv6 support. -### -.if !empty(PKG_OPTIONS:Minet6) -.endif -- cgit v1.2.3