diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2011-05-27 11:28:40 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2011-05-27 11:28:40 +0000 |
| commit | 2b4f184033fcbaaf8913e6f77f0f2422ba1efdbc (patch) | |
| tree | ebf545f2108bc2a31e02cd962e7a96d4d334412c | |
| parent | Add ~x86-fbsd keyword (diff) | |
| download | gentoo-2-2b4f184033fcbaaf8913e6f77f0f2422ba1efdbc.tar.gz gentoo-2-2b4f184033fcbaaf8913e6f77f0f2422ba1efdbc.tar.bz2 gentoo-2-2b4f184033fcbaaf8913e6f77f0f2422ba1efdbc.zip | |
Add ~x86-fbsd keyword; add patch for bsd install
(Portage version: 2.2.0_alpha32/cvs/FreeBSD i386)
| -rw-r--r-- | x11-misc/slim/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.2-bsd-install.patch | 35 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.3.2-r3.ebuild | 10 |
3 files changed, 48 insertions, 3 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 9ed8d3adf997..0716dfa1c0cb 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.65 2011/01/10 19:08:34 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.66 2011/05/27 11:28:39 naota Exp $ + + 27 May 2011; Naohiro Aota <naota@gentoo.org> slim-1.3.2-r3.ebuild, + +files/slim-1.3.2-bsd-install.patch: + Add ~x86-fbsd keyword; add patch for bsd install 10 Jan 2011; Brent Baude <ranger@gentoo.org> slim-1.3.2-r3.ebuild: stable ppc, bug 348542 diff --git a/x11-misc/slim/files/slim-1.3.2-bsd-install.patch b/x11-misc/slim/files/slim-1.3.2-bsd-install.patch new file mode 100644 index 000000000000..4fd85b05c595 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.2-bsd-install.patch @@ -0,0 +1,35 @@ +diff --git a/Makefile b/Makefile +index b743389..f7c1b33 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,10 +42,13 @@ slim: $(OBJECTS) + $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ + + install: slim install-theme +- install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim +- install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1 ++ install -d $(DESTDIR)$(PREFIX)/bin ++ install -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim ++ install -d $(DESTDIR)$(MANDIR)/man1 ++ install -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1 + test -e $(DESTDIR)$(CFGDIR)/slim.conf || \ +- install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf ++ (install -d $(DESTDIR)$(CFGDIR); \ ++ install -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf) + + clean: + @rm -f slim *.o +@@ -61,9 +64,10 @@ dist: + + + install-theme: +- install -D -m 644 themes/default/slim.theme \ ++ install -d $(DESTDIR)$(PREFIX)/share/slim/themes/default ++ install -m 644 themes/default/slim.theme \ + $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme +- install -D -m 644 themes/default/panel.png \ ++ install -m 644 themes/default/panel.png \ + $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png +- install -D -m 644 themes/default/background.jpg \ ++ install -m 644 themes/default/background.jpg \ + $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg diff --git a/x11-misc/slim/slim-1.3.2-r3.ebuild b/x11-misc/slim/slim-1.3.2-r3.ebuild index 00f5c32c1263..22df5492b819 100644 --- a/x11-misc/slim/slim-1.3.2-r3.ebuild +++ b/x11-misc/slim/slim-1.3.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r3.ebuild,v 1.5 2011/01/10 19:08:34 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r3.ebuild,v 1.6 2011/05/27 11:28:39 naota Exp $ EAPI=2 @@ -12,7 +12,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="branding pam" RDEPEND="x11-libs/libXmu @@ -42,6 +42,12 @@ src_prepare() { # Our Gentoo-specific config changes epatch "${FILESDIR}/${PN}-1.3.2-r2-config.diff" + if use elibc_FreeBSD; then + sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \ + || die "sed failed in Makefile" + epatch "${FILESDIR}/${PN}-1.3.2-bsd-install.patch" + fi + if use branding; then sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die fi |