summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/bison/Makefile6
-rw-r--r--package/bison/patches/patch-Makefile_in8
-rw-r--r--package/bison/patches/patch-lib_config_hin12
-rw-r--r--package/bison/patches/patch-lib_spawn_in_h18
-rw-r--r--package/bison/patches/patch-src_Makefile_in11
-rw-r--r--package/mplayer/Makefile7
-rw-r--r--package/mplayer/patches/patch-loader_win32_c10
-rw-r--r--package/pcmciautils/patches/patch-Makefile70
-rw-r--r--package/ruby/Makefile1
9 files changed, 110 insertions, 33 deletions
diff --git a/package/bison/Makefile b/package/bison/Makefile
index b3642d177..bf058fc9a 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -4,12 +4,12 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bison
-PKG_VERSION:= 2.4.1
+PKG_VERSION:= 2.4.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5
+PKG_MD5SUM:= 6fc502f135738e98fecf1e5c8de38d62
PKG_DESCR:= GNU parser generator
PKG_SECTION:= lang
-PKG_URL:= http://www.gnu.org/software/bison
+PKG_URL:= http://www.gnu.org/software/bison/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in
index 19d01c699..7f757fb29 100644
--- a/package/bison/patches/patch-Makefile_in
+++ b/package/bison/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- bison-2.4.1.orig/Makefile.in 2008-12-11 23:05:53.000000000 +0100
-+++ bison-2.4.1/Makefile.in 2010-02-23 20:11:17.748535777 +0100
-@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@
+--- bison-2.4.2.orig/Makefile.in 2010-03-20 18:14:08.000000000 +0100
++++ bison-2.4.2/Makefile.in 2010-07-30 17:11:16.198057000 +0200
+@@ -871,7 +871,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
+SUBDIRS = build-aux po runtime-po lib data src etc
aclocal_DATA = m4/bison-i18n.m4
- EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
+ EXTRA_DIST = .prev-version .version cfg.mk \
OChangeLog PACKAGING \
diff --git a/package/bison/patches/patch-lib_config_hin b/package/bison/patches/patch-lib_config_hin
deleted file mode 100644
index dde4f8ee0..000000000
--- a/package/bison/patches/patch-lib_config_hin
+++ /dev/null
@@ -1,12 +0,0 @@
---- bison-2.4.1.orig/lib/config.hin 2008-12-11 23:05:52.000000000 +0100
-+++ bison-2.4.1/lib/config.hin 2010-02-23 20:09:49.477285615 +0100
-@@ -399,6 +399,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
-
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
-
diff --git a/package/bison/patches/patch-lib_spawn_in_h b/package/bison/patches/patch-lib_spawn_in_h
new file mode 100644
index 000000000..a32d9eb93
--- /dev/null
+++ b/package/bison/patches/patch-lib_spawn_in_h
@@ -0,0 +1,18 @@
+--- bison-2.4.2.orig/lib/spawn.in.h 2010-03-17 20:17:04.000000000 +0100
++++ bison-2.4.2/lib/spawn.in.h 2010-07-30 17:23:46.000000000 +0200
+@@ -29,13 +29,8 @@
+ #ifndef _GL_SPAWN_H
+ #define _GL_SPAWN_H
+
+-/* Get definitions of 'struct sched_param' and 'sigset_t'.
+- But avoid namespace pollution on glibc systems. */
+-#ifndef __GLIBC__
+-# include <sched.h>
+-# include <signal.h>
+-#endif
+-
++#include <sched.h>
++#include <signal.h>
+ #include <sys/types.h>
+
+ #ifndef __THROW
diff --git a/package/bison/patches/patch-src_Makefile_in b/package/bison/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..0a1b9c247
--- /dev/null
+++ b/package/bison/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- bison-2.4.2.orig/src/Makefile.in 2010-03-20 18:14:10.000000000 +0100
++++ bison-2.4.2/src/Makefile.in 2010-07-30 17:28:09.000000000 +0200
+@@ -1313,7 +1313,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+ yacc:
+ echo '#! /bin/sh' >$@
+- echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
++ echo "exec bison -y "'"$$@"' >>$@
+ chmod a+x $@
+
+ echo:
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 0c9e3945c..7b516a989 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0-31648
-PKG_RELEASE:= 3
-PKG_MD5SUM:= eeb9219f9015e0e0dfbf4a70efefb751
+PKG_VERSION:= 1.0-31868
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 9d5c2c1c927947b31afa6f42c11e8f23
PKG_DESCR:= popular video player
PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
@@ -86,6 +86,7 @@ CONFIGURE_ARGS:= --prefix=/usr \
--target=${ARCH}-linux \
--cc=$(TARGET_CC) \
--host-cc=$(HOSTCC) \
+ --yasm='' \
--disable-mencoder \
--enable-fbdev \
--enable-alsa \
diff --git a/package/mplayer/patches/patch-loader_win32_c b/package/mplayer/patches/patch-loader_win32_c
deleted file mode 100644
index 2af53605d..000000000
--- a/package/mplayer/patches/patch-loader_win32_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mplayer-1.0-31648.orig/loader/win32.c 2010-07-09 11:53:19.000000000 +0200
-+++ mplayer-1.0-31648/loader/win32.c 2010-07-30 15:24:59.000000000 +0200
-@@ -65,7 +65,6 @@ for DLL to know too much about its envir
- #include <dirent.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <sys/timeb.h>
- #ifdef HAVE_KSTAT
- #include <kstat.h>
- #endif
diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile
index 313c2bb84..cb1f0e162 100644
--- a/package/pcmciautils/patches/patch-Makefile
+++ b/package/pcmciautils/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100
-+++ pcmciautils-017/Makefile 2010-05-29 17:15:03.515625000 +0200
++++ pcmciautils-017/Makefile 2010-07-30 17:34:46.000000000 +0200
@@ -94,12 +94,13 @@ PWD = $(shell pwd)
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". If you want
@@ -15,3 +15,71 @@
HOSTCC = gcc
export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
+@@ -264,30 +265,31 @@ clean:
+
+ install-hotplug:
+ $(INSTALL) -d $(DESTDIR)$(hotplugdir)
+- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
+- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
+
+ uninstall-hotplug:
+ - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc
+
+ install-socket-hotplug:
+- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
+- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
+
+ uninstall-socket-hotplug:
+ - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
+
+ install-socket-tools:
+- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
+
+ uninstall-socket-tools:
+ - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
+
+ install-tools:
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
+ $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
+- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir)
++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
+
+ uninstall-tools:
+ - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
+@@ -296,22 +298,24 @@ uninstall-tools:
+
+ install-config:
+ $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
+- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
+ if [ -f config/config.opts.$(ARCH) ]; then \
+- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
++ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
+ fi
+
+ uninstall-config:
+ # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts
+
+ install-udev:
+- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir)
++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
+
+ uninstall-udev:
+ - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
+
+ install-man:
+- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
+ $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8
+
+ uninstall-man:
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index a05372ca8..ea4e8b7a8 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= lang
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.ruby-lang.org
PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/
+PKG_HOST_DEPENDS:= !freebsd
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p429.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}-1.9.1-p429
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 05:11:34 +0000