diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-06 13:54:38 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-06 13:54:38 +0000 |
| commit | 40fd2eb0b7a5c4fcc0bf5f4ceeae1f126b6fefd7 (patch) | |
| tree | 9821e78d54837b28cbc50adf53bf0d27e0bd9915 /x11 | |
| parent | - Respect X11BASE (diff) | |
- Respect X11BASE by passing CONFIGURE_* variables to subdirs
Approved by: portmgr (linimon)
Notes
Notes:
svn path=/head/; revision=179029
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fireflies/Makefile | 4 | ||||
| -rw-r--r-- | x11/fireflies/files/patch-Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile index 1d8886a1717f..ffae78f2a1a8 100644 --- a/x11/fireflies/Makefile +++ b/x11/fireflies/Makefile @@ -25,6 +25,10 @@ CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \ --with-confdir=${LOCALBASE}/share/xscreensaver/config PLIST_SUB= VERSION=${PORTVERSION} +MAKE_ARGS= CONFIGURE_ENV=${CONFIGURE_ENV:Q} \ + CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \ + CONFIGURE_ARGS=${CONFIGURE_ARGS:Q} + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 diff --git a/x11/fireflies/files/patch-Makefile b/x11/fireflies/files/patch-Makefile index 61ddf507820b..e69b95afcfa1 100644 --- a/x11/fireflies/files/patch-Makefile +++ b/x11/fireflies/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue May 6 16:00:40 2003 -+++ Makefile Fri Oct 27 11:40:19 2006 +--- Makefile.orig Tue May 6 15:00:40 2003 ++++ Makefile Tue Dec 5 16:44:03 2006 @@ -1,4 +1,4 @@ -include Make.include +#include Make.include @@ -16,7 +16,7 @@ libgfx/src/libgfx.a: - gunzip -c libgfx-1.0.1.tar.gz | tar x - cd libgfx && ./configure && cd src && make -+ cd libgfx && ./configure && cd src && ${MAKE} ++ cd libgfx && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && cd src && ${MAKE} install: all sh ./installit $(DESTDIR) |