diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/esound/Makefile | 2 | ||||
| -rw-r--r-- | package/esound/files/esd.init | 1 | ||||
| -rw-r--r-- | package/jpeg/Makefile | 6 | ||||
| -rw-r--r-- | package/nss/Makefile | 12 | ||||
| -rw-r--r-- | package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk | 12 | ||||
| -rw-r--r-- | package/openldap/Makefile | 6 | ||||
| -rw-r--r-- | package/xinit/Makefile | 3 | ||||
| -rw-r--r-- | package/xinit/patches/patch-startx_cpp | 24 |
8 files changed, 50 insertions, 16 deletions
diff --git a/package/esound/Makefile b/package/esound/Makefile index 56e097c87..6a5da170f 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= esound PKG_VERSION:= 0.2.41 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 PKG_DESCR:= Enlightened Sound Daemon PKG_SECTION:= multimedia diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init index f576433d2..b2aed6149 100644 --- a/package/esound/files/esd.init +++ b/package/esound/files/esd.init @@ -4,6 +4,7 @@ . /etc/rc.conf case $1 in +autostop) ;; autostart) test x"${esd:-NO}" = x"NO" && exit 0 exec sh $0 start diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 2ab0d4941..b4609e757 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jpeg -PKG_VERSION:= 7 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 382ef33b339c299b56baf1296cda9785 +PKG_VERSION:= 8b +PKG_RELEASE:= 1 +PKG_MD5SUM:= e022acbc5b36cd2cb70785f5b575661e PKG_DESCR:= The Independent JPEG Groups JPEG runtime library PKG_SECTION:= libs PKG_URL:= http://www.ijg.org/ diff --git a/package/nss/Makefile b/package/nss/Makefile index 75b6332a3..bf3d64ec6 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss PKG_VERSION:= 3.12.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 40bf1bb0c7567827d3768d1fc6081100 PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs @@ -14,7 +14,7 @@ PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/ PKG_NOPARALLEL:= 1 -PKG_HOST_DEPENDS:= !cygwin !darwin +PKG_HOST_DEPENDS:= !cygwin PKG_TARGET_DEPENDS:= !foxboard WRKSRC= ${WRKDIST}/mozilla/security/nss @@ -33,13 +33,13 @@ endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr -#TLDFLAGS:= '' TLDFLAGS+= -ldl -XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ - ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" -ALL_TARGET:= build_coreconf all +XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist +XAKE_FLAGS+= ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux +XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" +ALL_TARGET:= build_coreconf all post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib diff --git a/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk b/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk new file mode 100644 index 000000000..83616841a --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk @@ -0,0 +1,12 @@ +--- nss-3.12.8.orig/mozilla/security/coreconf/UNIX.mk 2008-10-03 21:12:41.000000000 +0200 ++++ nss-3.12.8/mozilla/security/coreconf/UNIX.mk 2010-12-12 01:54:56.000000000 +0100 +@@ -38,7 +38,8 @@ + XP_DEFINE += -DXP_UNIX + LIB_SUFFIX = a + DLL_SUFFIX = so +-AR = ar cr $@ ++ARTOOL = ar ++AR = $(ARTOOL) cr $@ + LDOPTS += -L$(SOURCE_LIB_DIR) + + ifdef BUILD_OPT diff --git a/package/openldap/Makefile b/package/openldap/Makefile index f9a34f891..8b53713cb 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap PKG_VERSION:= 2.4.23 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 90150b8c0d0192e10b30157e68844ddf PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs @@ -33,8 +33,8 @@ $(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE} $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_UTILS},${PKGSD_OPENLDAP_UTILS},${PKGSC_OPENLDAP_UTILS})) $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_SLAPD},${PKGSD_OPENLDAP_SLAPD},${PKGSC_OPENLDAP_SLAPD})) -PKG_CONFIGURE_OPTIONS+= \ - --enable-slapd \ +PKG_CONFIGURE_OPTIONS+= --enable-slapd \ + --libexecdir=/usr/sbin \ --enable-bdb \ --disable-hdb \ --disable-relay \ diff --git a/package/xinit/Makefile b/package/xinit/Makefile index 7cd77646e..0497fa287 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xinit PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb PKG_DESCR:= X Window System initializer PKG_SECTION:= x11/apps @@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS:= --without-launchd +XAKE_FLAGS+= RAWCPP="$(TARGET_CROSS)cpp" post-install: $(INSTALL_DIR) $(IDIR_XINIT)/usr/bin diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp index 911346c59..cf47ce9b4 100644 --- a/package/xinit/patches/patch-startx_cpp +++ b/package/xinit/patches/patch-startx_cpp @@ -1,6 +1,26 @@ --- xinit-1.2.1.orig/startx.cpp 2010-03-15 23:35:56.000000000 +0100 -+++ xinit-1.2.1/startx.cpp 2010-07-15 21:25:44.458413180 +0200 -@@ -347,5 +347,8 @@ screenrestore ++++ xinit-1.2.1/startx.cpp 2010-12-13 17:44:35.000000000 +0100 +@@ -242,18 +242,7 @@ if [ x"$enable_xauth" = x1 ] ; then + removelist= + + XCOMM set up default Xauth info for this machine +- case `uname` in +- Linux*) +- if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then +- hostname=`hostname -f` +- else +- hostname=`hostname` +- fi +- ;; +- *) +- hostname=`hostname` +- ;; +- esac ++ hostname=`hostname` + + authdisplay=${display:-:0} + #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) +@@ -347,5 +336,8 @@ screenrestore kbd_mode -a #endif |