Don't use MULTI_PACKAGES when it's not needed, requested by espie@.

With tweaks from steven@ and espie@, ok ajacoutot@ espie@.
This commit is contained in:
landry 2007-10-25 09:30:13 +00:00
parent 4fd90303a0
commit 526c868956
7 changed files with 9 additions and 68 deletions

View File

@ -1,17 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/10/24 23:32:00 landry Exp $
# $OpenBSD: Makefile,v 1.2 2007/10/25 09:30:13 landry Exp $
COMMENT-main= simple login manager
COMMENT-themes= slim themes bundle
COMMENT= simple login manager
VTHEME= 1.2.3
DISTNAME= slim-1.3.0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
slim-${VTHEME}-themepack1a${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PKGNAME-main= ${DISTNAME}
PKGNAME-themes= slim-themes-${VTHEME}
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
HOMEPAGE= http://slim.berlios.de/
@ -25,17 +17,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main -themes
LIB_DEPENDS-themes=
PKG_ARCH-themes= *
USE_X11= Yes
NO_REGRESS= Yes
LIB_DEPENDS= jpeg::graphics/jpeg \
png::graphics/png
WANTLIB-main= X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype
WANTLIB= X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype
MAKE_FILE= Makefile.openbsd
MAKE_FLAGS+= CFGDIR=${SYSCONFDIR}
@ -49,8 +36,6 @@ pre-configure:
perl -pi -e 's!%%LOCALBASE%%!${LOCALBASE}!' ${WRKSRC}/slim.conf
post-install:
@tar xzf ${FULLDISTDIR}/slim-${VTHEME}-themepack1a${EXTRACT_SUFX} \
-C ${PREFIX}/share/slim/themes
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/slim
@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \

View File

@ -1,6 +1,6 @@
$OpenBSD: README.OpenBSD,v 1.1.1.1 2007/10/24 23:32:00 landry Exp $
$OpenBSD: README.OpenBSD,v 1.2 2007/10/25 09:30:13 landry Exp $
Slim can be started at boot time by adding the following to
!!SYSCONFDIR!!/rc.local:
/etc/rc.local:
if [ -x !!PREFIX!!/bin/slim ]; then
echo -n ' slim'; ( sleep 5; !!PREFIX!!/bin/slim -d ) &

View File

@ -1 +0,0 @@
This package contains themes for the slim login manager.

View File

@ -1,2 +1,2 @@
See ${PREFIX}/share/doc/slim/README.OpenBSD for more informations on
See ${PREFIX}/share/doc/slim/README.OpenBSD for more information on
starting slim for your architecture.

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/10/24 23:32:00 landry Exp $
@comment $OpenBSD: PLIST,v 1.1 2007/10/25 09:30:13 landry Exp $
@pkgpath x11/slim,-main
bin/slim
@man man/man1/slim.1
share/doc/slim/

View File

@ -1,44 +0,0 @@
@comment $OpenBSD: PLIST-themes,v 1.1.1.1 2007/10/24 23:32:00 landry Exp $
share/slim/
share/slim/themes/
share/slim/themes/capernoited/
share/slim/themes/capernoited/README
share/slim/themes/capernoited/background.jpg
share/slim/themes/capernoited/panel.png
share/slim/themes/capernoited/slim.theme
share/slim/themes/flower2/
share/slim/themes/flower2/README
share/slim/themes/flower2/background.jpg
share/slim/themes/flower2/panel.png
share/slim/themes/flower2/slim.theme
share/slim/themes/isolated/
share/slim/themes/isolated/README
share/slim/themes/isolated/background.jpg
share/slim/themes/isolated/panel.png
share/slim/themes/isolated/slim.theme
share/slim/themes/lotus-midnight/
share/slim/themes/lotus-midnight/COPYRIGHT.panel
share/slim/themes/lotus-midnight/LICENSE.panel
share/slim/themes/lotus-midnight/README
share/slim/themes/lotus-midnight/background.jpg
share/slim/themes/lotus-midnight/panel.png
share/slim/themes/lotus-midnight/slim.theme
share/slim/themes/lotus-sage/
share/slim/themes/lotus-sage/COPYRIGHT.panel
share/slim/themes/lotus-sage/LICENSE.panel
share/slim/themes/lotus-sage/README
share/slim/themes/lotus-sage/background.jpg
share/slim/themes/lotus-sage/panel.png
share/slim/themes/lotus-sage/slim.theme
share/slim/themes/mindlock/
share/slim/themes/mindlock/README
share/slim/themes/mindlock/background.jpg
share/slim/themes/mindlock/panel.png
share/slim/themes/mindlock/slim.theme
share/slim/themes/parallel-dimensions/
share/slim/themes/parallel-dimensions/COPYRIGHT.background
share/slim/themes/parallel-dimensions/COPYRIGHT.panel
share/slim/themes/parallel-dimensions/LICENSE.panel
share/slim/themes/parallel-dimensions/background.jpg
share/slim/themes/parallel-dimensions/panel.png
share/slim/themes/parallel-dimensions/slim.theme