diff options
116 files changed, 276 insertions, 569 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk index accef2f39..e8c1aef10 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -16,21 +16,6 @@ MASTER_SITE_KERNEL?= \ ftp://www.kernel.org/pub/linux/ \ http://www.kernel.org/pub/linux/ \ -MASTER_SITE_XORG?= \ - http://www.x.org/releases/individual/xserver/ \ - http://www.x.org/releases/individual/proto/ \ - http://www.x.org/releases/individual/app/ \ - http://www.x.org/releases/individual/xcb/ \ - http://www.x.org/releases/individual/lib/ \ - http://www.x.org/releases/individual/driver/ \ - http://www.x.org/releases/individual/util/ \ - http://xorg.freedesktop.org/releases/individual/app/ \ - http://xorg.freedesktop.org/releases/individual/lib/ \ - http://xorg.freedesktop.org/releases/individual/driver/ \ - http://www.x.org/releases/X11R7.7/src/everything/ \ - http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ - http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ - MASTER_SITE_GNU?= \ http://ftp.gnu.org/gnu/ \ ftp://ftp.gnu.org/gnu/ \ diff --git a/mk/package.mk b/mk/package.mk index 2a7a8dd81..486b21b17 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -11,6 +11,8 @@ endif endif AUTOTOOL_ENV+= PATH='${HOST_PATH}' \ + PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \ + PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \ ${COMMON_ENV} CONFIGURE_ENV+= PATH='${TARGET_PATH}' \ diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile index bdb9afe5f..b67637088 100644 --- a/package/bdftopcf/Makefile +++ b/package/bdftopcf/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= b9f172527fb78f1d02859f0e24675bfc0152ea589abab733a80a1256f6e91e69 PKG_DESCR:= font converter utility PKG_BUILDDEP:= libXfont PKG_SECTION:= x11/fonts -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/app/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 2102d98f1..d9fac7978 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= big requests extension headers PKG_SECTION:= dev/header PKG_HASH:= de68a1a9dd1a1219ad73531bff9f662bc62fcd777387549c43cd282399f4a6ea -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 4d85da167..82b3d14d8 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -45,10 +45,6 @@ HOST_CONFIGURE_ARGS+= --enable-ft=yes \ < |