cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts with 3.6 packages, thus allowing updates.

Browse Source 
Okay pvalchev@
This commit is contained in:
espie 2005-08-16 18:28:55 +00:00
parent 52ca940508
commit 9571031547
20 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2005/05/24 21:26:17 marcm Exp $ # $OpenBSD: Makefile,v 1.22 2005/08/16 18:28:55 espie Exp $
COMMENT= "general-purpose utility library" COMMENT= "general-purpose utility library"
COMMENT-docs= "glib2 documentation" COMMENT-docs= "glib2 documentation"
@ -6,7 +6,7 @@ COMMENT-docs= "glib2 documentation"
VERSION= 2.6.4 VERSION= 2.6.4
DISTNAME= glib-${VERSION} DISTNAME= glib-${VERSION}
PKGNAME= glib2-${VERSION} PKGNAME= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION} PKGNAME-docs= glib2-docs-${VERSION}p0
CATEGORIES= devel CATEGORIES= devel
HOMEPAGE= http://www.gtk.org HOMEPAGE= http://www.gtk.org

3
devel/glib2/pkg/PLIST-docs
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-docs,v 1.8 2005/05/24 21:26:17 marcm Exp $ @comment $OpenBSD: PLIST-docs,v 1.9 2005/08/16 18:28:55 espie Exp $
@conflict glib2-<2.4.6
share/gtk-doc/ share/gtk-doc/
share/gtk-doc/html/ share/gtk-doc/html/
share/gtk-doc/html/glib/ share/gtk-doc/html/glib/

4
devel/p5-Carp-Clan/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/12/01 05:35:58 kevlo Exp $ # $OpenBSD: Makefile,v 1.2 2005/08/16 18:28:55 espie Exp $
COMMENT= "report errors from perspective of caller of a clan of modules" COMMENT= "report errors from perspective of caller of a clan of modules"
DISTNAME= Carp-Clan-5.3 DISTNAME= Carp-Clan-5.3
PKGNAME= p5-${DISTNAME} PKGNAME= p5-${DISTNAME}p0
CATEGORIES= devel perl5 CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Carp/} MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Carp/}

3
devel/p5-Carp-Clan/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/01 05:35:58 kevlo Exp $ @comment $OpenBSD: PLIST,v 1.2 2005/08/16 18:28:55 espie Exp $
@conflict p5-Bit-Vector-<6.4
${P5SITE}/Carp/ ${P5SITE}/Carp/
${P5SITE}/Carp/Clan.pm ${P5SITE}/Carp/Clan.pm
${P5SITE}/Carp/Clan.pod ${P5SITE}/Carp/Clan.pod

4
mail/maildrop/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2005/08/13 18:19:32 espie Exp $ # $OpenBSD: Makefile,v 1.18 2005/08/16 18:28:55 espie Exp $
COMMENT= "local mail delivery agent with filtering abilities" COMMENT= "local mail delivery agent with filtering abilities"
COMMENT-utils= "userdb and quota tools for the Courier mail suite" COMMENT-utils= "userdb and quota tools for the Courier mail suite"
@ -19,7 +19,7 @@ FLAVOR?=
MULTI_PACKAGES= -utils MULTI_PACKAGES= -utils
SUBPACKAGE?= SUBPACKAGE?=
FULLPKGNAME-utils= courier-utils-${VERSION}p1 FULLPKGNAME-utils= courier-utils-${VERSION}p2
# GPL # GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes

3
mail/maildrop/pkg/PLIST-utils
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-utils,v 1.4 2005/08/13 18:19:32 espie Exp $ @comment $OpenBSD: PLIST-utils,v 1.5 2005/08/16 18:28:55 espie Exp $
@conflict maildrop-<=1.5.3
bin/deliverquota bin/deliverquota
bin/maildirmake bin/maildirmake
bin/makeuserdb bin/makeuserdb

6
net/isc-dhcp/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2005/07/23 09:42:54 jakob Exp $ # $OpenBSD: Makefile,v 1.11 2005/08/16 18:28:55 espie Exp $
COMMENT= "ISC DHCP Server" COMMENT= "ISC DHCP Server"
COMMENT-client= "ISC DHCP Client" COMMENT-client= "ISC DHCP Client"
@ -12,8 +12,8 @@ DISTFILES= dhcp-${VERSION}.tar.gz
WRKDIST= ${WRKDIR}/dhcp-${VERSION} WRKDIST= ${WRKDIR}/dhcp-${VERSION}
PKGNAME= isc-dhcp-server-${VERSION} PKGNAME= isc-dhcp-server-${VERSION}
PKGNAME-client= isc-dhcp-client-${VERSION} PKGNAME-client= isc-dhcp-client-${VERSION}p0
PKGNAME-omapi= isc-dhcp-omapi-${VERSION} PKGNAME-omapi= isc-dhcp-omapi-${VERSION}p0
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ \ MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ \
ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/ ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/

3
net/isc-dhcp/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2005/03/10 16:24:21 jakob Exp $ @comment $OpenBSD: PLIST,v 1.5 2005/08/16 18:28:56 espie Exp $
@conflict isc-dhcp-*
@man man/cat5/dhcp-eval.0 @man man/cat5/dhcp-eval.0
@man man/cat5/dhcp-options.0 @man man/cat5/dhcp-options.0
@man man/cat5/dhcpd.conf.0 @man man/cat5/dhcpd.conf.0

3
net/isc-dhcp/pkg/PLIST-client
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-client,v 1.1 2005/03/10 16:24:21 jakob Exp $ @comment $OpenBSD: PLIST-client,v 1.2 2005/08/16 18:28:56 espie Exp $
@conflict isc-dhcp-*
@man man/cat5/dhclient.conf.0 @man man/cat5/dhclient.conf.0
@man man/cat5/dhclient.leases.0 @man man/cat5/dhclient.leases.0
@man man/cat8/dhclient-script.0 @man man/cat8/dhclient-script.0

3
net/isc-dhcp/pkg/PLIST-omapi
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-omapi,v 1.1 2005/03/10 16:24:21 jakob Exp $ @comment $OpenBSD: PLIST-omapi,v 1.2 2005/08/16 18:28:56 espie Exp $
@conflict isc-dhcp-*
bin/omshell bin/omshell
include/dhcpctl.h include/dhcpctl.h
include/isc-dhcp/ include/isc-dhcp/

4
sysutils/sec/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2005/07/24 19:47:31 aanriot Exp $ # $OpenBSD: Makefile,v 1.4 2005/08/16 18:28:56 espie Exp $
COMMENT= "simple event correlator" COMMENT= "simple event correlator"
DISTNAME= sec-2.3.1 DISTNAME= sec-2.3.1
PKGNAME= ${DISTNAME}p1 PKGNAME= ${DISTNAME}p2
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simple-evcorr/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simple-evcorr/}

3
sysutils/sec/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2005/07/24 19:47:31 aanriot Exp $ @comment $OpenBSD: PLIST,v 1.3 2005/08/16 18:28:56 espie Exp $
@conflict nut-<2
bin/sec bin/sec
@man man/man1/sec.1 @man man/man1/sec.1
share/examples/sec/ share/examples/sec/

4
x11/gtk+2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2005/08/05 17:15:09 kurt Exp $ # $OpenBSD: Makefile,v 1.24 2005/08/16 18:28:56 espie Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -8,7 +8,7 @@ COMMENT-docs= "gtk+-2 documentation"
VERSION= 2.6.9 VERSION= 2.6.9
DISTNAME= gtk+-${VERSION} DISTNAME= gtk+-${VERSION}
PKGNAME= gtk+2-${VERSION} PKGNAME= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION} PKGNAME-docs= gtk+2-docs-${VERSION}p0
CATEGORIES= x11 devel CATEGORIES= x11 devel
HOMEPAGE= http://www.gtk.org HOMEPAGE= http://www.gtk.org

3
x11/gtk+2/pkg/PLIST-docs
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-docs,v 1.12 2005/05/24 21:29:11 marcm Exp $ @comment $OpenBSD: PLIST-docs,v 1.13 2005/08/16 18:28:56 espie Exp $
@conflict gtk+2-<2.4.9
share/gtk-doc/ share/gtk-doc/
share/gtk-doc/html/ share/gtk-doc/html/
share/gtk-doc/html/gdk/ share/gtk-doc/html/gdk/

4
x11/kde/i18n3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2005/08/16 09:49:53 espie Exp $ # $OpenBSD: Makefile,v 1.32 2005/08/16 18:28:56 espie Exp $
LANGS= ar bg bn br bs ca cs cy da de el en_GB eo es et eu fi fr fy ga he hi \ LANGS= ar bg bn br bs ca cs cy da de el en_GB eo es et eu fi fr fy ga he hi \
hsb hu is it ja lt mk nb nds nl nn pa pl pt pt_BR ro ru se sk sl \ hsb hu is it ja lt mk nb nds nl nn pa pl pt pt_BR ro ru se sk sl \
@ -15,7 +15,7 @@ FLAVORS+=$l
. if ${FLAVOR:M$l} . if ${FLAVOR:M$l}
DISTFILES=kde-i18n-$l-${VERSION}.tar.bz2 DISTFILES=kde-i18n-$l-${VERSION}.tar.bz2
WRKDIST=${WRKDIR}/kde-i18n-$l-${VERSION} WRKDIST=${WRKDIR}/kde-i18n-$l-${VERSION}
FULLPKGNAME=kde-i18n-$l-${VERSION}p0 FULLPKGNAME=kde-i18n-$l-${VERSION}p1
COMMENT= "$l translations for KDE" COMMENT= "$l translations for KDE"
DOC=share/doc/HTML/$l/ DOC=share/doc/HTML/$l/
LOC=share/locale/$l/LC_MESSAGES/ LOC=share/locale/$l/LC_MESSAGES/

3
x11/kde/i18n3/pkg/PLIST-sk
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-sk,v 1.3 2005/07/28 08:47:41 espie Exp $ @comment $OpenBSD: PLIST-sk,v 1.4 2005/08/16 18:28:56 espie Exp $
@conflict kdeedu-<3.3
share/apps/klettres/ share/apps/klettres/
share/apps/klettres/sk/ share/apps/klettres/sk/
share/apps/klettres/sk/alpha/ share/apps/klettres/sk/alpha/

4
x11/kde/pim3/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.25 2005/08/16 09:49:54 espie Exp $ # $OpenBSD: Makefile,v 1.26 2005/08/16 18:28:56 espie Exp $
COMMENT= "KDE personal information applications" COMMENT= "KDE personal information applications"
COMMENT-kpilot= "KDE interface to sync with Palm Pilot" COMMENT-kpilot= "KDE interface to sync with Palm Pilot"
CATEGORIES= x11 x11/kde productivity CATEGORIES= x11 x11/kde productivity
VERSION= 3.4.2 VERSION= 3.4.2
DISTNAME= kdepim-${VERSION} DISTNAME= kdepim-${VERSION}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
MODKDE_VERSION= 3.4 MODKDE_VERSION= 3.4
LIB_DEPENDS+= kdecore.6,artskde,kmedia2_idl,knewstuff,DCOP,kabc,kabc_file,kimproxy,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,kutils,kwalletclient,vcard::x11/kde/libs3 LIB_DEPENDS+= kdecore.6,artskde,kmedia2_idl,knewstuff,DCOP,kabc,kabc_file,kimproxy,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,kutils,kwalletclient,vcard::x11/kde/libs3

3
x11/kde/pim3/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.16 2005/08/16 09:49:54 espie Exp $ @comment $OpenBSD: PLIST,v 1.17 2005/08/16 18:28:56 espie Exp $
@conflict kdelibs-<3.4 @conflict kdelibs-<3.4
@conflict kdebase-<3.4 @conflict kdebase-<3.4
@conflict kpilot-*
bin/akregator bin/akregator
bin/egroupwarewizard bin/egroupwarewizard
bin/exchangewizard bin/exchangewizard

3
x11/kde/webdev/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2005/07/28 08:47:41 espie Exp $ # $OpenBSD: Makefile,v 1.8 2005/08/16 18:28:56 espie Exp $
COMMENT= "web development tool" COMMENT= "web development tool"
CATEGORIES= x11 x11/kde CATEGORIES= x11 x11/kde
VERSION= 3.4.2 VERSION= 3.4.2
DISTNAME= kdewebdev-${VERSION} DISTNAME= kdewebdev-${VERSION}
PKGNAME= ${DISTNAME}p0
MODKDE_VERSION= 3.4 MODKDE_VERSION= 3.4
LIB_DEPENDS= kdecore.6,DCOP,kabc,katepartinterfaces,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,ktexteditor,kutils,kwalletclient,vcard::x11/kde/libs3 \ LIB_DEPENDS= kdecore.6,DCOP,kabc,katepartinterfaces,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,ktexteditor,kutils,kwalletclient,vcard::x11/kde/libs3 \
exslt::textproc/libxslt \ exslt::textproc/libxslt \

3
x11/kde/webdev/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2005/06/02 14:01:27 espie Exp $ @comment $OpenBSD: PLIST,v 1.5 2005/08/16 18:28:57 espie Exp $
@conflict quanta-*
bin/kfilereplace bin/kfilereplace
bin/kimagemapeditor bin/kimagemapeditor
bin/klinkstatus bin/klinkstatus