[pkgsrc/trunk]: pkgsrc/mail - remove all .orig* files. Noted by Lubomir Sedla...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/deca03bf8dae
branches:  trunk
changeset: 504322:deca03bf8dae
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Dec 09 06:42:46 2005 +0000

description:
- remove all .orig* files. Noted by Lubomir Sedlacik.
- use post-patch instead of pre-configure

diffstat:

 mail/ja-squirrelmail/Makefile |  7 +++----
 mail/squirrelmail/Makefile    |  4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 0fedb14da33c -r deca03bf8dae mail/ja-squirrelmail/Makefile
--- a/mail/ja-squirrelmail/Makefile     Fri Dec 09 00:47:01 2005 +0000
+++ b/mail/ja-squirrelmail/Makefile     Fri Dec 09 06:42:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/09 06:42:46 martti Exp $
 
 DISTNAME=      squirrelmail-1.4.5
 PKGNAME=       ja-${DISTNAME}
@@ -51,7 +51,7 @@
 OWN_DIRS_PERMS=                ${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=       ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
-pre-configure:
+post-patch:
        cd ${WRKSRC};                                                   \
        for file in config/config_default.php; do                       \
                ${SED}  -e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g"   \
@@ -60,9 +60,8 @@
                ${MV} -f $${file}.fixed $${file};                       \
        done;                                                           \
        cd ${WRKSRC};                                                   \
-       ${FIND} . \( -name "*.orig" -o -name ".cvsignore" \) -print     \
+       ${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print    \
                | ${XARGS} ${RM} -f
-       ${FIND} . -name "*.orig_dist" -print | ${XARGS} ${RM} -f
 
 pre-install:
        @${SED} ${FILES_SUBST_SED} ${FILESDIR}/squirrelmail.conf.dist   \
diff -r 0fedb14da33c -r deca03bf8dae mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Fri Dec 09 00:47:01 2005 +0000
+++ b/mail/squirrelmail/Makefile        Fri Dec 09 06:42:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2005/12/09 06:42:46 martti Exp $
 
 DISTNAME=      squirrelmail-1.4.5
 PKGREVISION=   3
@@ -54,7 +54,7 @@
                ${MV} -f $${file}.fixed $${file};                       \
        done;                                                           \
        cd ${WRKSRC};                                                   \
-       ${FIND} . \( -name "*.orig" -o -name ".cvsignore" \) -print     \
+       ${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print    \
                | ${XARGS} ${RM} -f
 
 pre-install: