Re: pkg/48254: Update mail/fdm to 1.7

To: gnats-bugs%NetBSD.org@localhost, OBATA Akio <obache%netbsd.org@localhost>, pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/48254: Update mail/fdm to 1.7
From: Leonardo Taccari <iamleot%gmail.com@localhost>
Date: Thu, 3 Oct 2013 01:47:04 +0200

Hello OBATA!

On Wed, Oct 02, 2013 at 12:15:00PM +0000, OBATA Akio wrote:
>  SUBST might cause unwanted changes, so it may be danger.
>  You can use BSD_INSTALL_PROGRAM (and so on) in Makefile, and just a patch
>  will be sufficient.
A patch usually are a bit clearer than few REs.
However, I prefer to use SUBST in this case because it usually simplify
the update to a new version.
Here should not be danger because the REs will substitute only
variables that are (re)assigned.

>  It should be done with `post-build' target.
>  `post-install' may be triggered with privileged user with some build 
> configuration,
>  and `MANUAL' will be created as owned by the privileged user, then `make 
> clean' will
>  be result in `permission denied'.
Sorry for that, I will attach a new diff!


Thank you for clarification,
Ciao,
L.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fdm/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile    6 Feb 2013 23:22:44 -0000       1.4
+++ Makefile    2 Oct 2013 23:24:44 -0000
@@ -1,9 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2013/02/06 23:22:44 jperkin Exp $
 
-DISTNAME=              fdm-1.6
-PKGREVISION=           1
+DISTNAME=              fdm-1.7
 CATEGORIES=            mail
-PKG_REVISION=          1
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=fdm/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -11,27 +9,32 @@
 COMMENT=               Fetch or receive mail and deliver it in various ways
 LICENSE=               modified-bsd
 
-INSTALLATION_DIRS+=    ${EGDIR} ${DOCDIR}
-EGDIR=                 ${PREFIX}/share/examples/fdm
 DOCDIR=                        ${PREFIX}/share/doc/fdm
+EGDIR=                 ${PREFIX}/share/examples/fdm
+HAS_CONFIGURE=         yes
+INSTALLATION_DIRS+=    ${DOCDIR} ${EGDIR}
 
 USE_TOOLS+=            pax
-MAKE_ENV+=             PCRE=1
 
-SUBST_CLASSES+=                files
-SUBST_STAGE.files=     post-patch
-SUBST_FILES.files=     Makefile
-SUBST_SED.files=       -e "s|@INSTALL_PROGRAM_DIR@|${INSTALL_PROGRAM_DIR}|"
-SUBST_SED.files+=      -e "s|@INSTALL_PROGRAM@|${INSTALL_PROGRAM}|"
-SUBST_SED.files+=      -e "s|@INSTALL_MAN@|${INSTALL_MAN}|"
-SUBST_MESSAGE.files=   Fixing install invocation in Makefile
+SUBST_CLASSES+=                makefile
+SUBST_STAGE.makefile=  post-patch
+SUBST_MESSAGE.makefile=        Fixing install invocation in Makefile
+SUBST_FILES.makefile=  Makefile
+SUBST_SED.makefile+=   -e '/^FDEBUG=/d'        # Disable debug options
+SUBST_SED.makefile+=   -E -e 's,(INSTALLDIR=).*,\1 ${INSTALL_PROGRAM_DIR:Q},'
+SUBST_SED.makefile+=   -E -e 's,(INSTALLBIN=).*,\1 ${INSTALL_PROGRAM:Q},'
+SUBST_SED.makefile+=   -E -e 's,(INSTALLMAN=).*,\1 ${INSTALL_MAN:Q},'
+
+.include "options.mk"
+.include "../../databases/tdb/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+post-build:
+       cd ${WRKSRC} && ${MAKE_PROGRAM} -f ${WRKSRC}/tools/dist.mk manual
 
 post-install:
        cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/MANUAL ${DESTDIR}${DOCDIR}
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../databases/tdb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fdm/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST       17 Aug 2012 17:45:40 -0000      1.1.1.1
+++ PLIST       2 Oct 2013 23:24:44 -0000
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $
+@comment $NetBSD$
 bin/fdm
 man/man1/fdm.1
 man/man5/fdm.conf.5
 share/doc/fdm/MANUAL
 share/examples/fdm/f-terbeck.conf
 share/examples/fdm/g-lando.conf
-share/examples/fdm/n-marriott-old.conf
 share/examples/fdm/n-marriott.conf
 share/examples/fdm/t-ulmer.conf
 share/examples/fdm/w-maier.conf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fdm/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    23 Aug 2012 18:04:12 -0000      1.2
+++ distinfo    2 Oct 2013 23:24:44 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.2 2012/08/23 18:04:12 marino Exp $
 
-SHA1 (fdm-1.6.tar.gz) = fb8042f2355062848ff142c9604069b6657e6a82
-RMD160 (fdm-1.6.tar.gz) = 7e2c846b97dce20e123b8453732e107f88e0de8f
-Size (fdm-1.6.tar.gz) = 192159 bytes
-SHA1 (patch-aa) = 4284d7fc2e88fc9d42fc861e19a890dd526354d6
-SHA1 (patch-fdm.h) = 03ad0167120e06e76f4f1ef086c918c6a0cccf55
+SHA1 (fdm-1.7.tar.gz) = 5534d1ec1831794e092e0821db70f36b7e1ee961
+RMD160 (fdm-1.7.tar.gz) = 942f0989501645aa7e04bd428510daa309e8fca6
+Size (fdm-1.7.tar.gz) = 199808 bytes
+SHA1 (patch-fdm.h) = 5119757e747908a45ca778fe8d27d7944e37125f
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ options.mk  2 Oct 2013 23:24:44 -0000
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fdm
+PKG_SUPPORTED_OPTIONS= debug pcre
+PKG_SUGGESTED_OPTIONS= pcre
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Debug
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+   MAKE_ENV+=  FDEBUG=1
+.endif
+
+#
+# PCRE support
+#
+.if !empty(PKG_OPTIONS:Mpcre)
+   MAKE_ENV+=  PCRE=1
+.  include "../../devel/pcre/buildlink3.mk"
+.endif
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa    23 Aug 2012 18:04:12 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/08/23 18:04:12 marino Exp $
-
-cleanup cpp args dans adjust/fix Darwin build
-
---- Makefile.orig      2008-12-22 16:20:05.000000000 +0000
-+++ Makefile
-@@ -37,7 +37,7 @@ HDRS= fdm.h array.h fetch.h match.h deli
- YACC= yacc -d
- 
- CC?= cc
--INCDIRS+= -I. -I- -I/usr/local/include
-+INCDIRS+= -I. 
- .ifdef PROFILE
- # Don't use ccache
- CC= /usr/bin/gcc
-@@ -70,7 +70,8 @@ LIBS+= -lpcre
- .if ${OS} == "Darwin"
- SRCS+= compat/strtonum.c
- INCDIRS+= -Icompat -I/usr/local/include/openssl
--CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE
-+CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE 
-DNO_QUEUE_H -DNO_TREE_H
-+LIBS+=        -lresolv
- .endif
- 
- # NetBSD
-@@ -93,9 +94,9 @@ CFLAGS+= -DNO_STRTONUM
- .endif
- 
- PREFIX?= /usr/local
--INSTALLDIR= install -d
--INSTALLBIN= install -g bin -o root -m 555
--INSTALLMAN= install -g bin -o root -m 444
-+INSTALLDIR= @INSTALL_PROGRAM_DIR@
-+INSTALLBIN= @INSTALL_PROGRAM@
-+INSTALLMAN= @INSTALL_MAN@
- 
- LDFLAGS+= -L/usr/local/lib
- .ifdef PROFILE
Index: patches/patch-fdm.h
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fdm/patches/patch-fdm.h,v
retrieving revision 1.1
diff -u -r1.1 patch-fdm.h
--- patches/patch-fdm.h 23 Aug 2012 18:04:12 -0000      1.1
+++ patches/patch-fdm.h 2 Oct 2013 23:24:44 -0000
@@ -1,5 +1,8 @@
 $NetBSD: patch-fdm.h,v 1.1 2012/08/23 18:04:12 marino Exp $
 
+MAXNAMLEN is not POSIX. For systems that does not define it use NAME_MAX
+macro instead.
+
 --- fdm.h.orig 2012-08-23 17:13:57.000000000 +0000
 +++ fdm.h
 @@ -71,6 +71,10 @@

References:
- Re: pkg/48254: Update mail/fdm to 1.7
  - From: OBATA Akio

Prev by Date: Re: pkg/48258: mysql-server startup files may try to set to high fd-limit in pkgsrc-startup-file
Next by Date: Re: pkg/48254: Update mail/fdm to 1.7
Previous by Thread: Re: pkg/48254: Update mail/fdm to 1.7
Next by Thread: Re: pkg/48254: Update mail/fdm to 1.7
Indexes:

Home | Main Index | Thread Index | Old Index