diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2005-08-24 22:41:59 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2005-08-24 22:41:59 +0000 |
| commit | 35353f08ffcdf29fe22a415ec03e716276229dae (patch) | |
| tree | c12e078184b3d303c4bec52c8e1a143719781e20 /x11 | |
| parent | Fix the build on i386, even if that means disabling the Java frontend. (diff) | |
Fix CONFLICTS with kdeadmin.
Approved by: portmgr (linimon)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs3/Makefile | 5 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index f1ca19e1e777..6c228e839832 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,9 +37,9 @@ RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} .if ${PKGNAMESUFFIX} == -nocups -CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* .else -CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f1ca19e1e777..6c228e839832 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,9 +37,9 @@ RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} .if ${PKGNAMESUFFIX} == -nocups -CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* .else -CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif |