Mark rman as conflicting with kdebase for now.

It looks like this is the same program, so it would be better
to have kde depend on rman, probably.
This commit is contained in:
espie 2000-06-20 16:37:41 +00:00
parent 8e4c3a0948
commit fdbd2fbe63
4 changed files with 9 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2000/03/27 05:39:23 kevlo Exp $ # $OpenBSD: Makefile,v 1.10 2000/06/20 16:37:41 espie Exp $
# Original from: Ejovi Nuwere <ejovi@ejovi.net> # Original from: Ejovi Nuwere <ejovi@ejovi.net>
DISTNAME= rman-3.0.8 DISTNAME= rman-3.0.8
@ -14,8 +14,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM="conflicting no fee/free license" PERMIT_DISTFILES_CDROM="conflicting no fee/free license"
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/rman ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/rman ${PREFIX}/bin
chmod 755 ${PREFIX}/bin/rman chmod 755 ${PREFIX}/bin/rman

View File

@ -1,2 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2000/06/20 16:37:42 espie Exp $
@pkgcfl kdebase-*
bin/rman bin/rman
man/man1/rman.1 man/man1/rman.1

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2000/04/16 18:31:23 brad Exp $ # $OpenBSD: Makefile,v 1.8 2000/06/20 16:37:42 espie Exp $
# Original Author: Yanick Cote <yanick@fries.net> # Original Author: Yanick Cote <yanick@fries.net>
DISTNAME= kdebase-1.1.2 DISTNAME= kdebase-1.1.2
CATEGORIES= x11 CATEGORIES= x11
NEED_VERSION= 1.234 NEED_VERSION= 1.301
MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
DIST_SUBDIR= kde DIST_SUBDIR= kde
@ -22,14 +22,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
USE_BZIP2= Yes USE_BZIP2= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
GNU_CONFIGURE= Yes CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --prefix='$${DESTDIR}${PREFIX}' \ CONFIGURE_ARGS+= --enable-static \
--enable-static \
--with-qt-includes="${LOCALBASE}/include/X11/qt" \ --with-qt-includes="${LOCALBASE}/include/X11/qt" \
--with-qt-libraries="${LOCALBASE}/lib" --with-qt-libraries="${LOCALBASE}/lib"
CONFIGURE_ENV= RUN_KAPPFINDER=no CONFIGURE_ENV= RUN_KAPPFINDER=no

View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2000/06/20 16:37:43 espie Exp $
@pkgcfl rman-*
bin/kappfinder bin/kappfinder
bin/kappfinder_restart bin/kappfinder_restart
bin/kaudioserver bin/kaudioserver