remove the -gnome subpackage.

This commit is contained in:
wcobb 2003-04-06 00:48:23 +00:00
parent 17cc8d2718
commit 457f6d366e
5 changed files with 4 additions and 147 deletions

View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.27 2002/09/03 01:22:21 wcobb Exp $
# $OpenBSD: Makefile,v 1.28 2003/04/06 00:48:23 wcobb Exp $
COMMENT= "Multimedia player for the X Window System"
COMMENT-gnome= "GNOME applet for XMMS"
COMMENT-esd= "Esound output plugin for XMMS"
COMMENT-vorbis= "Ogg Vorbis input plugin for XMMS"
COMMENT-mikmod= "Mikmod input plugin for XMMS"
@ -9,7 +8,6 @@ COMMENT-mp3= "MP3 input plugin for XMMS"
VERSION= 1.2.7
DISTNAME= xmms-${VERSION}
PKGNAME-gnome= xmms-gnome-${VERSION}
PKGNAME-esd= xmms-esd-${VERSION}
PKGNAME-vorbis= xmms-vorbis-${VERSION}
PKGNAME-mikmod= xmms-mikmod-${VERSION}
@ -35,12 +33,9 @@ MASTER_SITES= http://www.xmms.org/files/$V/ \
MASTER_SITES0= http://vedge.com.ar/hack/ \
http://mirror.csoft.org/xmms/
PSEUDO_FLAVORS= no_gnome no_esd no_vorbis no_mikmod no_mp3
PSEUDO_FLAVORS= no_esd no_vorbis no_mikmod no_mp3
FLAVOR?=
MULTI_PACKAGES=
.if !${FLAVOR:L:Mno_gnome}
MULTI_PACKAGES+= -gnome
.endif
.if !${FLAVOR:L:Mno_esd}
MULTI_PACKAGES+= -esd
.endif
@ -63,7 +58,8 @@ LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
USE_LIBTOOL= Yes
USE_X11= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--without-gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
@ -77,11 +73,6 @@ DOCS= README NEWS
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-gnome"
RUN_DEPENDS= ::audio/xmms
LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
panel_applet.0::x11/gnome/core
. endif
. if ${SUBPACKAGE} == "-esd"
LIB_DEPENDS= esd.2::audio/esound
RUN_DEPENDS= ::audio/xmms
@ -100,14 +91,6 @@ PERMIT_DISTFILES_CDROM= "patent issues"
RUN_DEPENDS= ::audio/xmms
. endif
.else
. if ${MULTI_PACKAGES:M-gnome}
LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
panel_applet.0::x11/gnome/core
CONFIGURE_ARGS+= --with-gnome=${LOCALBASE}
CONFIGURE_ENV+= CPP_FLAGS="-I${LOCALBASE}/include"
. else
CONFIGURE_ARGS+= --without-gnome
. endif
. if ${MULTI_PACKAGES:M-esd}
LIB_DEPENDS+= esd.2::audio/esound
CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE}
@ -138,9 +121,5 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/xmms
.if ${MULTI_PACKAGES:M-gnome}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xmms-gnome
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/xmms-gnome
.endif
.include <bsd.port.mk>

View File

@ -1,28 +0,0 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
FILES='
CORBA/servers/gnomexmms.gnorba
'
echo
echo "+--------------- $1"
echo "| To really remove $1 from your system you should also"
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
echo "| If you are planning on installing $1 again in the future"
echo "| you can leave it as it is."
echo "|"
echo "| FYI, the following configuration files belongs to this package:"
echo "|"
for f in ${FILES}; do
echo "| ${SYSCONFDIR}/$f"
done
echo "+--------------- $1"
echo
exit 0

View File

@ -1,3 +0,0 @@
GNOME interface of XMMS (gnomexmms).
WWW: ${HOMEPAGE}

View File

@ -1,83 +0,0 @@
#!/bin/sh
#
# $OpenBSD: INSTALL-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
set -e
PREFIX=${PKG_PREFIX:-/usr/local}
PATH=/bin:/usr/bin:/sbin:/usr/sbin
P_NAME=xmms-gnome
DEST_PFX=${SYSCONFDIR}
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
FILES='
CORBA/servers/gnomexmms.gnorba
'
do_post() {
echo
echo "+--------------- ${P_NAME}"
# install or take note of existing config files
for f in ${FILES}; do
if [ -f "${DEST_PFX}/$f" ]; then
OLD_CONFS="${OLD_CONFS} $f"
else
if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
exit 1
fi
NEW_CONFS="${NEW_CONFS} $f"
fi
done
# print status report
if [ -n "${NEW_CONFS}" ]; then
echo "| The following NEW configuration files have been installed:"
echo "|"
for f in ${NEW_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
if [ -n "${OLD_CONFS}" ]; then
if [ -n "${NEW_CONFS}" ]; then
echo "|"
fi
echo "| The following OLD configuration files was found and have NOT been overwritten:"
echo "| You should however manually compare them to their equivalents in "
echo "|"
echo "| ${SOURCE_PFX}"
echo "|"
echo "| and update your configuration if needed."
echo "|"
for f in ${OLD_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
echo "+--------------- ${P_NAME}"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
do_post
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,8 +0,0 @@
@comment $OpenBSD: PLIST-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
bin/gnomexmms
man/man1/gnomexmms.1
share/applets/Multimedia/gnomexmms.desktop
share/examples/xmms-gnome/CORBA/servers/gnomexmms.gnorba
@dirrm share/examples/xmms-gnome/CORBA/servers
@dirrm share/examples/xmms-gnome/CORBA
@dirrm share/examples/xmms-gnome