diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /shells | |
parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip |
Notes
Diffstat (limited to 'shells')
-rw-r--r-- | shells/bash/Makefile | 4 | ||||
-rw-r--r-- | shells/fish/Makefile | 3 | ||||
-rw-r--r-- | shells/flash/Makefile | 4 | ||||
-rw-r--r-- | shells/zsh/Makefile | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index ba337aa0e0ae..fe4f3f97b527 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -98,9 +98,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 diff --git a/shells/fish/Makefile b/shells/fish/Makefile index b1b1d2284dc7..f6e501e0817c 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -22,8 +22,7 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= LIBS="${LDFLAGS}" CONFIGURE_ARGS= --docdir=${DOCSDIR} OPTIONS= XSEL "Build with xsel" on \ diff --git a/shells/flash/Makefile b/shells/flash/Makefile index eb9b876a9443..87333e8e4abe 100644 --- a/shells/flash/Makefile +++ b/shells/flash/Makefile @@ -15,8 +15,8 @@ COMMENT= A ncurses-based restriction shell USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -rdynamic" \ - LDFLAGS="${LDFLAGS} -rdynamic" +LDFLAGS+= -rdynamic +CFLAGS+= -rdynamic SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index f5ec69dfa1ad..c7927961e8ec 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -31,7 +31,7 @@ USE_NCURSES= yes USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} .endif -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \ --enable-function-subdirs @@ -91,7 +91,7 @@ CONFIGURE_ARGS+= --enable-maildir-support .endif .if defined(WITH_ZSH_STATIC) -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static" +LDFLAGS+= -static CONFIGURE_ARGS+= --disable-dynamic PLIST_SUB+= SHARED="@comment " .else |