diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/imap-uw/Makefile | 22 | ||||
| -rw-r--r-- | mail/imap-uw/files/patch-sum | 4 | ||||
| -rw-r--r-- | mail/imap-uw/patches/patch-aa | 19 |
3 files changed, 28 insertions, 17 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 4bbbed0ed94..588087bad23 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/12/13 21:26:53 tron Exp $ +# $NetBSD: Makefile,v 1.18 2000/12/17 17:07:56 jlam Exp $ DISTNAME= imap-2000a PKGNAME= imap-uw-2000a @@ -15,27 +15,30 @@ MESSAGE_FILE= ${WRKDIR}/MESSAGE INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM} INST_LIB= ${LIBTOOL} ${INSTALL_DATA} +INC_DIR= ${PREFIX}/include/c-client DOC_DIR= ${PREFIX}/share/doc/imap-uw .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -BUILDNAME= gso +ALL_TARGET= gso .else -BUILDNAME= neb +ALL_TARGET= neb .endif -do-configure: +NO_CONFIGURE= # defined +MAKE_ENV+= EXTRACFLAGS="${CFLAGS}" + +post-build: ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ < ${WRKSRC}/src/imapd/imapd.8c > ${WRKDIR}/imapd.8 ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ < ${WRKSRC}/src/ipopd/ipopd.8c > ${WRKDIR}/ipopd.8 + +pre-install: ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} -do-build: - cd ${WRKSRC} && ${MAKE} ${BUILDNAME} PREFIX=${PREFIX} CC="${LIBTOOL} ${CC} -g" - do-install: ${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib ${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec @@ -51,12 +54,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOC_DIR} ${INSTALL_DATA} ${WRKSRC}/docs/RELNOTES ${DOC_DIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOC_DIR} - ${INSTALL_DATA_DIR} ${PREFIX}/include/c-client + ${INSTALL_DATA_DIR} ${INC_DIR} for i in linkage.h mail.h rfc822.h misc.h imap4r1.h osdep.h smtp.h \ nntp.h env_unix.h fs.h ftl.h nl.h tcp.h env.h linkage.c; \ do \ - ${INSTALL_DATA} ${WRKSRC}/c-client/$$i \ - ${PREFIX}/include/c-client ; \ + ${INSTALL_DATA} ${WRKSRC}/c-client/$$i ${INC_DIR}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum index 6c9e1ff2bc0..a161cea4b5a 100644 --- a/mail/imap-uw/files/patch-sum +++ b/mail/imap-uw/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.9 2000/12/13 21:26:54 tron Exp $ +$NetBSD: patch-sum,v 1.10 2000/12/17 17:07:57 jlam Exp $ -MD5 (patch-aa) = 6059d31af88cc99ea92914250f20c07c +MD5 (patch-aa) = 8fc46b28f1ed163310ba2db06ed67124 MD5 (patch-ab) = bb937534f987fe7a8a365c1ffcd8760d MD5 (patch-ac) = b105631b853f128cbae3e00a72bfbf78 MD5 (patch-ad) = 6b10bb3e3475a2bad35c4f704b10f6a4 diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa index ea7a9ff7511..9e849758e6f 100644 --- a/mail/imap-uw/patches/patch-aa +++ b/mail/imap-uw/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2000/11/09 03:35:34 hubertf Exp $ +$NetBSD: patch-aa,v 1.8 2000/12/17 17:07:58 jlam Exp $ ---- Makefile.orig Wed Oct 25 01:52:21 2000 +--- Makefile.orig Thu Nov 2 16:04:11 2000 +++ Makefile -@@ -276,7 +276,7 @@ +@@ -272,7 +272,7 @@ + # gradually-increasing intervals, starting at 2800-2900, and becoming + # permanent at 48,300. + +-EXTRACFLAGS= ++#EXTRACFLAGS= + + + # Extra linker flags (additional/alternative libraries, etc.) +@@ -285,7 +285,7 @@ #SPECIALS= EXTRASPECIALS= # *** TEMPORARY FOR PINE BUILD *** @@ -11,12 +20,12 @@ $NetBSD: patch-aa,v 1.7 2000/11/09 03:35:34 hubertf Exp $ SPECIALS=GSSDIR=$(GSSDIR) # *** TEMPORARY FOR PINE BUILD *** -@@ -423,7 +423,7 @@ +@@ -432,7 +432,7 @@ @echo Building c-client for $(OS)... echo $(SPECIALS) $(EXTRASPECIALS) > c-client/SPECIALS $(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" \ - $(SPECIALS) $(EXTRASPECIALS) -+ $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)" ++ $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="${LIBTOOL} $(CC)" echo $(OS) > OSTYPE $(TOUCH) rebuild |