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 /x11-themes | |
parent | Fix installation with PORTSDOCS (diff) |
- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead
PR: 157936
Submitted by: myself
Exp-runs by: pav
Approved by: pav
Notes
Notes:
svn path=/head/; revision=282282
Diffstat (limited to 'x11-themes')
-rw-r--r-- | x11-themes/clearlooks/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/emerald-themes/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/gnome-backgrounds/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/gnome-themes-extras/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/gnome-themes/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/gtk-engines2/Makefile | 3 | ||||
-rw-r--r-- | x11-themes/kde-style-lipstik/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/kde-style-tiblit/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/kde-windeco-knifty/Makefile | 2 |
9 files changed, 15 insertions, 14 deletions
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile index 7329a183eb52..7a1cc921f2a0 100644 --- a/x11-themes/clearlooks/Makefile +++ b/x11-themes/clearlooks/Makefile @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(PORTNAME) && !defined(PKGNAMESUFFIX) OPTIONS+= ANIMATION "Enable experimental animated progressbars" Off \ diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile index 6dbf825d6668..b78d74622f96 100644 --- a/x11-themes/emerald-themes/Makefile +++ b/x11-themes/emerald-themes/Makefile @@ -21,8 +21,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \ diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index 96133ec15ee0..1a23d014e77b 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -20,7 +20,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile index 87c76b0a0972..03e38ea758b0 100644 --- a/x11-themes/gnome-themes-extras/Makefile +++ b/x11-themes/gnome-themes-extras/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GNOME= gnomehack libgnomeui intlhack INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 517be04f189c..8df56732aabc 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -27,7 +27,7 @@ USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index f564c14ca440..3da2b0a5607f 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -25,7 +25,8 @@ USE_GNOME= gnomehack gtk20 intlhack ltasneededhack USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= ANIMATION "Enable experimental animated progressbars" off diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile index 6179f54c5dbf..cd65677c66df 100644 --- a/x11-themes/kde-style-lipstik/Makefile +++ b/x11-themes/kde-style-lipstik/Makefile @@ -18,7 +18,7 @@ COMMENT= Modified Plastik KDE style USE_KDEBASE_VER=3 USE_AUTOTOOLS= libtool -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile index 6a4af3109465..bb569289bc80 100644 --- a/x11-themes/kde-style-tiblit/Makefile +++ b/x11-themes/kde-style-tiblit/Makefile @@ -19,7 +19,7 @@ COMMENT= KDE style focused on customization USE_BZIP2= yes USE_KDEBASE_VER=3 USE_AUTOTOOLS= libtool -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile index 086c083700b0..7092c48f69e8 100644 --- a/x11-themes/kde-windeco-knifty/Makefile +++ b/x11-themes/kde-windeco-knifty/Makefile @@ -18,7 +18,7 @@ COMMENT= Lightweight KDE window decoration USE_BZIP2= yes USE_KDEBASE_VER=3 -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} USE_AUTOTOOLS= libtool WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} |