diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Depends.mk | 1 | ||||
| -rw-r--r-- | package/base-files/files/etc/banner | 2 | ||||
| -rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in | 18 | ||||
| -rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in.orig | 12 | ||||
| -rw-r--r-- | package/rdate/rdate.init | 14 | ||||
| -rw-r--r-- | package/xf86-video-geode/Config.in | 1 | ||||
| -rw-r--r-- | package/xf86-video-geode/Makefile | 13 |
7 files changed, 31 insertions, 30 deletions
diff --git a/package/Depends.mk b/package/Depends.mk index a606e3756..d00b72b3b 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -228,6 +228,7 @@ endif wx200d-compile: postgresql-compile xfsprogs-compile: e2fsprogs-compile libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile +xf86-video-geode-compile: xorg-server-compile xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ damageproto-compile scrnsaverproto-compile resourceproto-compile \ diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner index bdee76e22..49dbb9685 100644 --- a/package/base-files/files/etc/banner +++ b/package/base-files/files/etc/banner @@ -1,3 +1 @@ - Linux created with OpenADK - --- build from revision $R --- diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in index 3a5366af1..9d27c162e 100644 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:41:42.000000000 +0100 ++++ libX11-1.1.5/src/util/Makefile.in 2009-05-30 21:53:42.350425696 +0200 +@@ -52,7 +52,7 @@ makekeys_OBJECTS = makekeys-makekeys.$(O + makekeys_LDADD = $(LDADD) + makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(HOSTLDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles @@ -82,7 +82,7 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ BIGFONT_LIBS = @BIGFONT_LIBS@ CC = @CC@ @@ -10,9 +19,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ +@@ -227,9 +227,9 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) +-makekeys_CFLAGS = $(X11_CFLAGS) ++makekeys_CFLAGS = $(HOSTCFLAGS) -#override CC = gcc +override CC = gcc diff --git a/package/libX11/patches/patch-src_util_Makefile_in.orig b/package/libX11/patches/patch-src_util_Makefile_in.orig deleted file mode 100644 index fb4885f40..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in.orig +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:39:31.000000000 +0100 -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) - --#override CC = gcc -+override CC = gcc - LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - EXTRA_DIST = mkks.sh - diff --git a/package/rdate/rdate.init b/package/rdate/rdate.init index 88bf464b9..988028f59 100644 --- a/package/rdate/rdate.init +++ b/package/rdate/rdate.init @@ -1,15 +1,13 @@ -#!/bin/mksh -#FWINIT 54 -# It’s important that this is lower than openntpd’s FWinit number +#!/bin/sh +#PKG rdate +#INIT 54 + . /etc/rc.conf + case $1 in autostart|start|restart) - if [[ $(ls -l /usr/sbin/rdate) != *ucb* ]]; then - rm -f /usr/sbin/rdate - ln -s ../ucb/rdate /usr/sbin/rdate - fi [[ $rdate_flags = NO ]] && exit 0 - /usr/ucb/rdate $rdate_flags + rdate $rdate_flags ;; autostop|stop) ;; diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in index 1505d48f1..d809a8570 100644 --- a/package/xf86-video-geode/Config.in +++ b/package/xf86-video-geode/Config.in @@ -2,5 +2,6 @@ config ADK_PACKAGE_XF86_VIDEO_GEODE prompt "xf86-video-geode........................... X11 driver for AMD Geode" tristate default n + select ADK_PACKAGE_XORG_SERVER help http://www.x.org diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 0c57d851f..b5699a1d1 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -9,15 +9,18 @@ PKG_NAME:= xf86-video-geode PKG_VERSION:= 2.11.2 PKG_RELEASE:= 1 PKG_MD5SUM:= dc9cbe88f38f82e27dbfb66f9f99fc98 -MASTER_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_DESCR:= X11 driver for AMD Geode VGA chip +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers |