diff options
| author | will <will@FreeBSD.org> | 2002-07-04 19:35:44 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2002-07-04 19:35:44 +0000 |
| commit | 210f31c64051769f63d1f851833be4213437de62 (patch) | |
| tree | 2dae45a5c28703aab943e7b93e51bfef6f1919c7 | |
| parent | ea95fb36f09c673184164051ae385673a11fd92d (diff) | |
| download | FreeBSD-ports-210f31c64051769f63d1f851833be4213437de62.zip FreeBSD-ports-210f31c64051769f63d1f851833be4213437de62.tar.gz | |
Update to 3.0.2 (full log):
General:
[1] Add a means of updating via patches rather than always using tarballs.
Unfortunately, this method proved unreliable due to the binary files
included with most of the KDE tarballs. For now, leave this support
in until I can decide what to do with it.
[2] Remove patches that were fixed in KDE CVS for KDE_3_0_BRANCH. This
includes removal of malloc.h (from our viewpoint at least), a bug in
kiconloader, and a typo in knode.
[3] Move the current KDE version number to KDE_VERSION in bsd.kde.mk.
[4] Support the notion of KDE_PREFIX.
[5] Move arts and kde3-i18n* ports to use Makefile.kde.
french/kde3-i18n:
[6] Remove cruft from when this was generated with a core dump in the
3.0.1 distribution generation.
All other ports: No changes of note not mentioned above.
Thanks to the quick testers for their assistance with this upgrade:
Tested by: Matt Douhan <matt@athame.co.uk>
Andy Fawcett <andy@athame.co.uk>
Dave Cantrell <phaedrus@alltel.net>
| -rw-r--r-- | Mk/bsd.kde.mk | 7 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 7 | ||||
| -rw-r--r-- | x11/kde3/Makefile | 2 | ||||
| -rw-r--r-- | x11/kde4/Makefile | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 0bf1eb4..068a8fd 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -67,6 +67,7 @@ USE_KDELIBS_VER=2 # kdelibs 3.x common stuff LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 +PREFIX= ${KDE_PREFIX} .else @@ -95,6 +96,12 @@ CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" .elif ${USE_QT_VER} == 3 +# Yeah, it's namespace pollution, but this is really the best place for this +# stuff since arts/kdelibs use it. +KDE_VERSION= 3.0.2 +KDE_ORIGVER= 3.0.1 +KDE_PREFIX?= ${LOCALBASE} + QTCPPFLAGS?= QTCGFLIBS?= diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 0bf1eb4..068a8fd 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -67,6 +67,7 @@ USE_KDELIBS_VER=2 # kdelibs 3.x common stuff LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 +PREFIX= ${KDE_PREFIX} .else @@ -95,6 +96,12 @@ CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" .elif ${USE_QT_VER} == 3 +# Yeah, it's namespace pollution, but this is really the best place for this +# stuff since arts/kdelibs use it. +KDE_VERSION= 3.0.2 +KDE_ORIGVER= 3.0.1 +KDE_PREFIX?= ${LOCALBASE} + QTCPPFLAGS?= QTCGFLIBS?= diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 8004c9f..d370280 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 3.0.1 +PORTVERSION= ${KDE_VERSION} CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 8004c9f..d370280 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 3.0.1 +PORTVERSION= ${KDE_VERSION} CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none |
