cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't require gnu grep; RE changes from naddy. (gnu sed still needed).

Browse Source 
- add a comment reminding people to bump both PKGNAMEs together.

ok naddy@
This commit is contained in:
sthen 2009-06-25 22:45:56 +00:00
parent 2805d23144
commit 507ec0f8ae
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
databases/lbdb/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2009/06/08 17:13:49 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2009/06/25 22:45:56 sthen Exp $
COMMENT-main = little brother's database, email address query tools
COMMENT-ldap = LDAP support for little brother's database
@ -6,8 +6,9 @@ COMMENT-ldap = LDAP support for little brother's database
VERSION = 0.36
DISTNAME = lbdb_${VERSION}
PKGNAME-main = lbdb-${VERSION}p1
PKGNAME-ldap = lbdb-ldap-${VERSION}p1
# bump all subpackages together
PKGNAME-main = lbdb-${VERSION}p2
PKGNAME-ldap = lbdb-ldap-${VERSION}p2
CATEGORIES = databases mail
@ -21,9 +22,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
RUN_DEPENDS-main = ::textproc/gsed \
::sysutils/ggrep
RUN_DEPENDS-main = ::textproc/gsed
RUN_DEPENDS-ldap = ::databases/p5-ldap \
:${FULLPKGNAME-main}:databases/lbdb

19
databases/lbdb/patches/patch-m_muttalias_sh_in
View File

@ -1,21 +1,14 @@
$OpenBSD: patch-m_muttalias_sh_in,v 1.1.1.1 2008/06/15 07:22:57 sthen Exp $
--- m_muttalias.sh.in.orig Tue Mar 11 23:27:20 2008
+++ m_muttalias.sh.in Tue Mar 11 23:27:35 2008
@@ -33,13 +33,13 @@ m_muttalias_query()
$OpenBSD: patch-m_muttalias_sh_in,v 1.2 2009/06/25 22:45:56 sthen Exp $
--- m_muttalias.sh.in.orig Thu Jun 25 22:00:49 2009
+++ m_muttalias.sh.in Thu Jun 25 22:05:14 2009
@@ -34,8 +34,8 @@ m_muttalias_query()
if [ -f "$file" ]
then
- grep -ia "$@" $file \
grep -ia "$@" $file \
- | grep -a '^alias[ ][ ]*[^,][^,]*[ ][ ]*\([^,]\|\\\".*\\\"\)*$' \
- | sed -e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*<\([^ >][^ >]*\)>[ ][ ]*(\([^<>()]*\))[^()<>]*$/\2 \3 alias \1/' \
+ ggrep -ia "$@" $file \
+ | ggrep -a '^alias[ ][ ]*[^,][^,]*[ ][ ]*\([^,]\|\\\".*\\\"\)*$' \
+ | grep -Ea '^alias[ ][ ]*[^,][^,]*[ ][ ]*([^,]|\\\".*\\\")*$' \
+ | gsed -e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*<\([^ >][^ >]*\)>[ ][ ]*(\([^<>()]*\))[^()<>]*$/\2 \3 alias \1/' \
-e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*\(\\\".*\\\"[^<>()]*\|[^<>()]*\)<\([^<>()]*\)>[^<>]*$/\3 \2 alias \1/' \
-e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*\([^<>()]*\)(\(\\\".*\\\"[^<>()]*\|[^<>()]*\))[^()<>]*$/\2 \3 alias \1/' \
-e 's/\\\"//g' \
- | grep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$'
+ | ggrep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$'
fi
done
}