diff options
| author | martti <martti> | 2005-12-09 06:42:46 +0000 |
|---|---|---|
| committer | martti <martti> | 2005-12-09 06:42:46 +0000 |
| commit | 773a47a232b0bdc4afe274659d356fdf5256aff3 (patch) | |
| tree | 8e6818bdbf0fdcfd54f6795d453974c8a2d49b69 /mail | |
| parent | 28e4903b631e4f39aca30c6e51f6993dce6cf1dc (diff) | |
| download | pkgsrc-773a47a232b0bdc4afe274659d356fdf5256aff3.tar.gz | |
- remove all .orig* files. Noted by Lubomir Sedlacik.
- use post-patch instead of pre-configure
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ja-squirrelmail/Makefile | 7 | ||||
| -rw-r--r-- | mail/squirrelmail/Makefile | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile index e9f895da9dd..2ca7defa0ed 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -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+= ${SMDIR} ${SMDIR}/config 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 @@ pre-configure: ${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 --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 574e59c945f..86e2086c9cd 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -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 @@ post-patch: ${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: |