diff --git a/srcpkgs/OpenRC-devel b/srcpkgs/OpenRC-devel new file mode 120000 index 0000000000..b0e8714781 --- /dev/null +++ b/srcpkgs/OpenRC-devel @@ -0,0 +1 @@ +OpenRC \ No newline at end of file diff --git a/srcpkgs/OpenRC/OpenRC-devel.template b/srcpkgs/OpenRC/OpenRC-devel.template new file mode 100644 index 0000000000..ece94ce1aa --- /dev/null +++ b/srcpkgs/OpenRC/OpenRC-devel.template @@ -0,0 +1,19 @@ +# Template file for 'OpenRC-devel'. +# +short_desc="${sourcepkg} development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run glibc-devel +Add_dependency run OpenRC + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/lib ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/lib/lib*.so ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +} diff --git a/srcpkgs/OpenRC/files/rc.conf b/srcpkgs/OpenRC/files/rc.conf deleted file mode 100644 index a436efa727..0000000000 --- a/srcpkgs/OpenRC/files/rc.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Global OpenRC default configuration. Please note that defaults -# are set in /etc/default/rc.conf. -# -# Use this file to customize the system startup process. -# -if [ -r /etc/default/rc.conf ]; then - . /etc/default/rc.conf -fi - -# -# Add your settings after this line, default settings will be -# overriden and defaults always will be preserved. -# diff --git a/srcpkgs/OpenRC/patches/xbps_changes.diff b/srcpkgs/OpenRC/patches/xbps_changes.diff index 67aa4a82b7..3581ee5010 100644 --- a/srcpkgs/OpenRC/patches/xbps_changes.diff +++ b/srcpkgs/OpenRC/patches/xbps_changes.diff @@ -4,7 +4,6 @@ xbps changes: a global system locale. * Adds consolefont by default in "boot" runlevel. * Modified inittab to pass correct parameters to reboot(8). -* Build fix for kernel>=2.6.30 * Sets unicode, rc_logger and rc_shell in /etc/rc.conf by default. * Sets windowkeys and fix_euro in /etc/conf.d/keymaps by default. * In local service, start/stop vmware-tools services if script exists. @@ -64,47 +63,6 @@ xbps changes: # To fix this, set to "yes" -fix_euro="NO" +fix_euro="yes" ---- etc/rc.conf.in.orig 2009-06-05 10:20:11.000000000 +0200 -+++ etc/rc.conf.in 2009-10-09 18:12:16.137121909 +0200 -@@ -1,5 +1,9 @@ --# Global OpenRC configuration settings -- -+# Global OpenRC default configuration settings. -+# -+# WARNING: if you want to change these settings, use -+# /etc/rc.conf. This file sets global default settings and -+# they MUST be overwritten in /etc/rc.conf instead. -+# - # Set to "YES" if you want the rc system to try and start services - # in parallel for a slight speed improvement. When running in parallel we - # prefix the service output with it's name as the output will get -@@ -18,7 +22,7 @@ - # If not specified we use $SHELL, otherwise the one specified in /etc/passwd, - # otherwise /bin/sh - # Linux users could specify /sbin/sulogin --#rc_shell=/bin/sh -+rc_shell=/sbin/sulogin - - # Do we allow any started service in the runlevel to satisfy the depedency - # or do we want all of them regardless of state? For example, if net.eth0 -@@ -44,7 +48,7 @@ - # /var/log/rc.log - # NOTE: Linux systems require the devfs service to be started before - # logging can take place and as such cannot log the sysinit runlevel. --#rc_logger="YES" -+rc_logger="YES" - - # By default we filter the environment for our running scripts. To allow other - # variables through, add them here. Use a * to allow all variables through. -@@ -73,7 +77,7 @@ - # There variables are shared between many init scripts - - # Set unicode to YES to turn on unicode support for keyboards and screens. --#unicode="NO" -+unicode="YES" - - # Network fstypes. Below is the default. - net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs" --- conf.d/staticroute.Linux.orig 2009-10-21 10:58:05.000000000 +0200 +++ conf.d/staticroute.Linux 2009-10-21 10:58:17.000000000 +0200 @@ -1,2 +1,3 @@ @@ -159,3 +117,32 @@ xbps changes: # We should always return 0 return 0 } +--- etc/rc.conf.in.orig 2009-12-05 03:30:48.675483763 +0100 ++++ etc/rc.conf.in 2009-12-05 03:31:13.034222373 +0100 +@@ -18,7 +18,7 @@ + # If not specified we use $SHELL, otherwise the one specified in /etc/passwd, + # otherwise /bin/sh + # Linux users could specify /sbin/sulogin +-#rc_shell=/bin/sh ++rc_shell=/sbin/sulogin + + # Do we allow any started service in the runlevel to satisfy the depedency + # or do we want all of them regardless of state? For example, if net.eth0 +@@ -44,7 +44,7 @@ + # /var/log/rc.log + # NOTE: Linux systems require the devfs service to be started before + # logging can take place and as such cannot log the sysinit runlevel. +-#rc_logger="YES" ++rc_logger="YES" + + # By default we filter the environment for our running scripts. To allow other + # variables through, add them here. Use a * to allow all variables through. +@@ -73,7 +73,7 @@ + # There variables are shared between many init scripts + + # Set unicode to YES to turn on unicode support for keyboards and screens. +-#unicode="NO" ++unicode="YES" + + # Network fstypes. Below is the default. + net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs" diff --git a/srcpkgs/OpenRC/template b/srcpkgs/OpenRC/template index d635d459e0..e69e0a7d9f 100644 --- a/srcpkgs/OpenRC/template +++ b/srcpkgs/OpenRC/template @@ -1,7 +1,7 @@ # Template file for 'OpenRC' pkgname=OpenRC version=0.5.3 -#revision=1 +revision=1 wrksrc=openrc-${version} distfiles="http://roy.marples.name/downloads/openrc/openrc-$version.tar.bz2" build_style=gnu_makefile @@ -22,6 +22,7 @@ conf_files="/etc/rc.conf /etc/conf.d/bootmisc /etc/conf.d/consolefont /etc/conf.d/keymaps /etc/conf.d/local /etc/conf.d/locale /etc/conf.d/localmount /etc/conf.d/modules /etc/conf.d/network /etc/conf.d/urandom /etc/conf.d/staticroute /etc/inittab" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full psmisc @@ -46,9 +47,6 @@ post_install() ${DESTDIR}/etc/logrotate.d/OpenRC install -D -m644 ${FILESDIR}/locale.confd \ ${DESTDIR}/etc/conf.d/locale - install -d ${DESTDIR}/etc/default - mv ${DESTDIR}/etc/rc.conf ${DESTDIR}/etc/default - install -m 644 ${FILESDIR}/rc.conf ${DESTDIR}/etc # # Create a fake rc.d directory with links to mimic old sysvinit # runlevel stuff.