diff options
41 files changed, 526 insertions, 214 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 481071261..5ba6ab1e6 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -923,12 +923,12 @@ $(eval $(call KMOD_template,SOUND,sound,\ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \ $(MODULES_DIR)/kernel/sound/core/snd \ - $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ + $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,41)) diff --git a/mk/package.mk b/mk/package.mk index cd1f47b6d..32dc5464d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -45,6 +45,7 @@ endif ifeq ($(ADK_NATIVE),y) CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ + SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 5d6d8cc30..fa1baf5cb 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -26,7 +26,7 @@ ifneq ($(filter autotool,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 \ AUTOMAKE_VERSION=1.9 \ - autoreconf -vif $(MAKE_TRACE) + autoreconf -vf;libtoolize $(MAKE_TRACE) endif ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ @@ -79,7 +79,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --prefix=/usr \ --datadir=/usr/share \ --mandir=/usr/share/man \ - --libexecdir=/usr/sbin \ + --libexecdir=/usr/libexec \ --localstatedir=/var \ --sysconfdir=/etc \ --disable-nls \ diff --git a/mk/vars.mk b/mk/vars.mk index bc1940682..2151348b0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -102,15 +102,15 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | cpio -i -d --quiet ;; \ + cat $$file | cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | cpio -i -d --quiet ;; \ + gzip -dc $$file | cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | cpio -i -d --quiet ;; \ + bzip2 -dc $$file | cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ diff --git a/package/Config.in b/package/Config.in index b6450f22c..54247a83a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -647,6 +647,8 @@ source "package/libXrender/Config.in" source "package/libXrender/Config.in.lib" source "package/libXt/Config.in" source "package/libXt/Config.in.lib" +source "package/libXft/Config.in" +source "package/libXft/Config.in.lib" source "package/libXxf86dga/Config.in" source "package/libXxf86dga/Config.in.lib" source "package/pixman/Config.in" diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index d4acd7275..a8a6c3420 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -42,9 +42,10 @@ CONFIGURE_ARGS+= --with-notify=none \ post-install: ${INSTALL_DIR} ${IDIR_DOVECOT}/etc - ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot - ${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc + ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin + ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot/modules/{imap,lda,pop3} + ${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc $(CP) ${WRKINST}/usr/lib/dovecot/modules/*.so \ ${IDIR_DOVECOT}/usr/lib/dovecot/modules/ $(CP) ${WRKINST}/usr/lib/dovecot/modules/imap/*.so \ @@ -53,9 +54,9 @@ post-install: ${IDIR_DOVECOT}/usr/lib/dovecot/modules/lda/ $(CP) ${WRKINST}/usr/lib/dovecot/modules/pop3/*.so \ ${IDIR_DOVECOT}/usr/lib/dovecot/modules/pop3/ - $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot/* \ - ${IDIR_DOVECOT}/usr/lib/dovecot/ - $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot \ + $(INSTALL_BIN) ${WRKINST}/usr/libexec/dovecot/* \ + ${IDIR_DOVECOT}/usr/libexec/dovecot/ + $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot* \ ${IDIR_DOVECOT}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 5f551b785..56149598a 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -27,8 +27,6 @@ $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION})) $(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION})) -INSTALL_STYLE:= manual - CONFIGURE_ARGS+= --disable-doc CONFIGURE_ENV+= LIBS="-lncurses" diff --git a/package/findutils/Makefile b/package/findutils/Makefile index 25c4e9ac7..d53312381 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -20,10 +20,10 @@ $(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},$ CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes post-install: - $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/{s,}bin + $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin $(IDIR_FINDUTILS)/usr/libexec $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} \ $(IDIR_FINDUTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/sbin/{bigram,code,frcode} \ - $(IDIR_FINDUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \ + $(IDIR_FINDUTILS)/usr/libexec include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/git/Makefile b/package/git/Makefile index 0f8a71014..4d3b382e3 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ ac_cv_snprintf_returns_bogus=no post-install: - $(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core + $(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core $(INSTALL_DIR) $(IDIR_GIT)/usr/share/git-core/templates $(CP) $(WRKINST)/usr/share/git-core/templates/* \ $(IDIR_GIT)/usr/share/git-core/templates @@ -36,6 +36,6 @@ post-install: $(CP) $(WRKINST)/usr/bin/git-receive-pack $(IDIR_GIT)/usr/bin $(CP) $(WRKINST)/usr/bin/git-upload-pack $(IDIR_GIT)/usr/bin $(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin - ${CP} $(WRKINST)/usr/sbin/git-core/* $(IDIR_GIT)/usr/sbin/git-core + ${CP} $(WRKINST)/usr/libexec/git-core/* $(IDIR_GIT)/usr/libexec/git-core include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index ab2e42d6a..bf8ff399f 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -20,6 +20,6 @@ CONFIG_STYLE:= manual post-install: ${INSTALL_DIR} ${IDIR_HDPARM}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/hdparm ${IDIR_HDPARM}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/sbin/hdparm ${IDIR_HDPARM}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile index 26a759821..03c74f509 100644 --- a/package/hdparm/patches/patch-Makefile +++ b/package/hdparm/patches/patch-Makefile @@ -1,19 +1,32 @@ --- hdparm-9.15.orig/Makefile 2008-12-10 01:14:28.000000000 +0100 -+++ hdparm-9.15/Makefile 2010-02-05 22:40:21.943083430 +0100 ++++ hdparm-9.15/Makefile 2010-02-13 12:24:25.000000000 +0100 @@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man CC ?= gcc STRIP ?= strip - + -CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) +CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) - + #LDFLAGS = -s -static LDFLAGS = -s @@ -28,7 +28,6 @@ all: hdparm - + hdparm: hdparm.h sgio.h $(OBJS) $(CC) $(LDFLAGS) -o hdparm $(OBJS) - $(STRIP) hdparm - + hdparm.o: hdparm.h sgio.h - + +@@ -46,9 +45,9 @@ install: all hdparm.8 + if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi + if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ + elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi +- $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm +- if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ +- elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi ++ $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm ++ if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ ++ elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi + + clean: + -rm -f hdparm $(OBJS) core 2>/dev/null diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index c51d2e58b..49cd7e94d 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -17,7 +17,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= V=1 CONFIGURE_ENV+= ac_cv_path_XMLTO=true post-install: diff --git a/package/libXft/Makefile b/package/libXft/Makefile new file mode 100644 index 000000000..03a06ab75 --- /dev/null +++ b/package/libXft/Makefile @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libXft +PKG_VERSION:= 2.1.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0a1e129b1d8b2d3905dc02a64255b781 +PKG_DESCR:= X FreeType library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-malloc0returnsnull \ + --disable-install-makestrs + +post-install: + ${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtool/patches/01-force_dlopen_deplibs.patch b/package/libtool/patches/01-force_dlopen_deplibs.patch deleted file mode 100644 index dfcf56b32..000000000 --- a/package/libtool/patches/01-force_dlopen_deplibs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libtool-1.5.14/libltdl/acinclude.m4 libtool-1.5.14.new/libltdl/acinclude.m4 ---- libtool-1.5.14/libltdl/acinclude.m4 2005-02-12 13:20:02.000000000 +0100 -+++ libtool-1.5.14.new/libltdl/acinclude.m4 2006-04-17 23:00:24.000000000 +0200 -@@ -6228,10 +6228,8 @@ - ;; - esac - ]) --if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then - AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], - [Define if the OS needs help to load dependent libraries for dlopen().]) --fi - ])# AC_LTDL_SYS_DLOPEN_DEPLIBS - - diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index f36e728c6..20d31b1d0 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autotool +AUTOTOOL_STYLE:= autoconf TCFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-samples diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index f76bffa39..cb4400e45 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP+= libxml2 gnutls python PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ -PKG_HOST_DEPENDS:= !freebsd +PKG_HOST_DEPENDS:= !freebsd !netbsd PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl new file mode 100644 index 000000000..c56cae4e9 --- /dev/null +++ b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl @@ -0,0 +1,7 @@ +--- mrd6-0.9.6.orig/src/scripts/generate-modules-cpp.pl 2007-03-22 03:37:07.000000000 +0100 ++++ mrd6-0.9.6/src/scripts/generate-modules-cpp.pl 2010-02-13 16:04:53.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/env perl + + use strict; diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 42341cbe0..1818b893c 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -67,6 +67,7 @@ post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec ${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \ ${IDIR_OPENSSH_SERVER}/usr/bin @@ -85,8 +86,8 @@ post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \ ${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/sftp-server \ - ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \ + ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssh/files/sshd_config b/package/openssh/files/sshd_config index 1ef114940..b8a2c1a70 100644 --- a/package/openssh/files/sshd_config +++ b/package/openssh/files/sshd_config @@ -104,7 +104,7 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems -Subsystem sftp /usr/sbin/sftp-server +Subsystem sftp /usr/libexec/sftp-server # Example of overriding settings on a per-user basis #Match User anoncvs diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile index 36b4896b7..64757186b 100644 --- a/package/pdnsd/Makefile +++ b/package/pdnsd/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://www.phys.uu.nl/~rombouts/pdnsd.html PKG_SITES:= http://www.phys.uu.nl/~rombouts/pdnsd/releases/ +PKG_HOST_DEPENDS:= !netbsd + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-par.tar.gz include $(TOPDIR)/mk/package.mk diff --git a/package/python/Makefile b/package/python/Makefile index 7c313dcad..63d830e95 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= lang PKG_URL:= http://www.python.org PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ +PKG_HOST_DEPENDS:= !netbsd + DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 35835b9b3..21ec52811 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -18,19 +18,24 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_FILE:= GNUmakefile -XAKE_FLAGS+= optflags='' debugflags='' -CONFIGURE_ARGS+= --enable-wide-getaddrinfo +XAKE_FLAGS+= optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes INSTALL_TARGET:= install-nodoc -# Enable some ruby extension / options -post-configure: - #echo "option nodynamic" >> ${WRKBUILD}/ext/Setup - #echo "socket" >> ${WRKBUILD}/ext/Setup +pre-configure: + cp ${WRKBUILD}/ext/Setup ${WRKBUILD}/ext/Setup.orig + echo "option nodynamic" >> ${WRKBUILD}/ext/Setup + (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ + ./configure --prefix=$(STAGING_TOOLS) \ + ); + $(MAKE) -C ${WRKBUILD} ruby + cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby + cp ${WRKBUILD}/ext/Setup.orig ${WRKBUILD}/ext/Setup + $(MAKE) -C ${WRKBUILD} install-nodoc + $(MAKE) -C ${WRKBUILD} clean post-install: - rm ${WRKINST}/usr/lib/*.a rm -rf ${WRKINST}/usr/lib/site_ruby rm -rf ${WRKINST}/usr/include ${CP} ${WRKINST}/usr ${IDIR_RUBY}/ diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in new file mode 100644 index 000000000..0e1e996bc --- /dev/null +++ b/package/ruby/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- ruby-1.9.1-p378.orig/Makefile.in 2009-11-12 17:01:28.000000000 +0100 ++++ ruby-1.9.1-p378/Makefile.in 2010-02-13 21:10:02.000000000 +0100 +@@ -274,7 +274,7 @@ INSNS = opt_sc.inc optinsn.inc optunifs. + + $(INSNS): + @$(RM) $(PROGRAM) +- $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ ++ $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + + node_name.inc: + $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ diff --git a/package/ruby/patches/patch-common_mk b/package/ruby/patches/patch-common_mk new file mode 100644 index 000000000..06a4a7e10 --- /dev/null +++ b/package/ruby/patches/patch-common_mk @@ -0,0 +1,10 @@ +--- ruby-1.9.1-p378.orig/common.mk 2009-11-12 17:01:28.000000000 +0100 ++++ ruby-1.9.1-p378/common.mk 2010-02-13 20:20:27.000000000 +0100 +@@ -400,7 +400,7 @@ extconf: $(PREP) + $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) + + $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) +- @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ ++ $(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ + -install_name=$(RUBY_INSTALL_NAME) \ + -so_name=$(RUBY_SO_NAME) rbconfig.rb diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 0ddc09efe..f6918ad68 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5 PKG_DESCR:= x-term with unicode support PKG_SECTION:= x11 -PKG_DEPENDS:= libx11 -PKG_BUILDDEP+= libX11 +PKG_DEPENDS:= libx11 fontconfig libxft +PKG_BUILDDEP+= libX11 fontconfig libXft PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ diff --git a/package/squid/Makefile b/package/squid/Makefile index d10b71a16..0179da4bd 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -16,6 +16,8 @@ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.0/ PKG_MULTI:= 1 #PKG_CXX:= SQUID +PKG_HOST_DEPENDS:= !netbsd + AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) BASIC_AUTH_HELPERS+= getpwnam diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index 005601528..93825ae73 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -21,12 +21,14 @@ CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_DIR}/usr/include" post-install: - ${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/{bin,sbin} + ${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/bin + ${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/sbin + ${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/libexec ${INSTALL_BIN} ${WRKINST}/usr/bin/pppclient \ ${IDIR_SSLTUNNEL}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/pppwho \ ${IDIR_SSLTUNNEL}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/pppserver \ - ${IDIR_SSLTUNNEL}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/libexec/pppserver \ + ${IDIR_SSLTUNNEL}/usr/libexec/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/wput/Makefile b/package/wput/Makefile index 40649b3e4..fd9bc0ce9 100644 --- a/package/wput/Makefile +++ b/package/wput/Makefile @@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WPUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-g-switch +CONFIGURE_ARGS+= --disable-g-switch \ + --without-ssl post-install: ${INSTALL_DIR} ${IDIR_WPUT}/usr/bin diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 6b86959ad..30da515e0 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 3.0.0 +PKG_VERSION:= 3.1.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= e2fsprogs -PKG_MD5SUM:= ec734f935ec87ebb8be890d29380a3e6 +PKG_MD5SUM:= c2308b46ee707597ac50aae418d321b8 PKG_DESCR:= Utilities to create and check XFS filesystems PKG_SECTION:= admin PKG_DEPENDS:= libuuid libpthread +PKG_BUILDDEP+= e2fsprogs PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ @@ -19,15 +19,16 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoconf +INSTALL_STYLE:= manual + CONFIGURE_ARGS+= --enable-gettext=no \ --with-gnu-ld CONFIGURE_ENV+= DEBUG=" " OPTIMIZER=" " ALL_TARGET= -post-install: - ${INSTALL_DIR} ${IDIR_XFSPROGS}/sbin - ${CP} ${WRKINST}/usr/sbin/mkfs.xfs ${IDIR_XFSPROGS}/sbin/ - ${CP} ${WRKINST}/usr/sbin/xfs_repair ${IDIR_XFSPROGS}/sbin/ +do-install: + ${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xfsprogs/patches/patch-aclocal_m4 b/package/xfsprogs/patches/patch-aclocal_m4 deleted file mode 100644 index 62851935f..000000000 --- a/package/xfsprogs/patches/patch-aclocal_m4 +++ /dev/null @@ -1,16 +0,0 @@ ---- xfsprogs-3.0.0.orig/aclocal.m4 2009-02-04 23:29:25.000000000 +0100 -+++ xfsprogs-3.0.0/aclocal.m4 2009-12-12 00:50:23.000000000 +0100 -@@ -148,11 +148,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], - test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" - AC_SUBST(pkg_group) - -- pkg_distribution=`uname -s` -+ pkg_distribution=Linux - test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" - AC_SUBST(pkg_distribution) - -- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` -+ pkg_platform=linux - test -z "$PLATFORM" || pkg_platform="$PLATFORM" - AC_SUBST(pkg_platform) - ]) diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure new file mode 100644 index 000000000..e8068cfba --- /dev/null +++ b/package/xfsprogs/patches/patch-configure @@ -0,0 +1,370 @@ +--- xfsprogs-3.1.1.orig/configure 2010-01-29 21:33:34.000000000 +0100 ++++ xfsprogs-3.1.1/configure 2010-02-14 00:02:10.000000000 +0100 +@@ -6404,7 +6404,7 @@ fi + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool' + + + +@@ -11216,7 +11216,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" + + +- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` ++ pkg_platform=linux + test -z "$PLATFORM" || pkg_platform="$PLATFORM" + + +@@ -12602,349 +12602,6 @@ fi + + + +-for ac_header in aio.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ |