summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2007-01-23 15:57:50 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2007-01-23 15:57:50 +0000
commit4cefbd8e9d74a04e24994a793e66b6651c320959 (patch)
tree5157975077daebdf0dd4c57c352cebc0a9afb7c7
parentchange MAINTAINER adress (diff)
move MASTER_SITES_XFCE to bsd.sites.mk
Notes
Notes: svn path=/head/; revision=183083
-rw-r--r--Mk/bsd.sites.mk9
-rw-r--r--x11-wm/xfce4/bsd.xfce.mk8
2 files changed, 10 insertions, 7 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 18ef98957f39..9ccd84ed1a42 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1261,6 +1261,15 @@ MASTER_SITE_XEMACS+= \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/xemacs/&,}
.endif
+.if !defined(IGNORE_MASTER_SITE_XFCE)
+MASTER_SITES_XFCE+= \
+ http://mocha.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.us.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.de.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.ca-us.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.p0llux.be/xfce/%SUBDIR%/src/
+.endif
+
.if !defined(IGNORE_MASTER_SITE_XFREE)
MASTER_SITE_XFREE+= \
http://www.gtlib.cc.gatech.edu/pub/XFree86/%SUBDIR%/source/ \
diff --git a/x11-wm/xfce4/bsd.xfce.mk b/x11-wm/xfce4/bsd.xfce.mk
index 29528d4e6b90..bb4d90e4c60d 100644
--- a/x11-wm/xfce4/bsd.xfce.mk
+++ b/x11-wm/xfce4/bsd.xfce.mk
@@ -1,10 +1,4 @@
-MASTER_SITES_XFCE= http://mocha.xfce.org/archive/%SUBDIR%/src/ \
- http://www.us.xfce.org/archive/%SUBDIR%/src/ \
- http://www.de.xfce.org/archive/%SUBDIR%/src/ \
- http://www.ca-us.xfce.org/archive/%SUBDIR%/src/ \
- http://www.p0llux.be/xfce/%SUBDIR%/src/
-
-MASTER_SITE_SUBDIR= xfce-4.4.0
+MASTER_SITE_SUBDIR?= xfce-4.4.0
configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"