diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-12-19 21:19:54 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-12-19 21:19:54 +0000 |
| commit | 1160fd7012e9178dcc628403246431be1258220c (patch) | |
| tree | 7e40351a3df9a22683e158e9f84074c3071a0c56 /Mk | |
| parent | - Update to 0.9.3-5.wink.at.nivit.;) (diff) | |
Update to KDE 3.5.5 / KOffice 1.6.1
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=180198
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.kde.mk | 9 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index d4bcdede52ca..b110398033b3 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -50,6 +50,10 @@ USE_KDELIBS_VER=3 CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +## Every KDE application is inherently IPv6-capable + +CATEGORIES+=ipv6 + ## XXX - This really belongs into bsd.port.mk .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= @@ -97,7 +101,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.4 +KDE_VERSION= 3.5.5 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -125,7 +129,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ + QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" .endif # !defined(QT_NONSTANDARD) .else IGNORE= cannot install: unsupported value of USE_QT_VER diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index d4bcdede52ca..b110398033b3 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -50,6 +50,10 @@ USE_KDELIBS_VER=3 CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +## Every KDE application is inherently IPv6-capable + +CATEGORIES+=ipv6 + ## XXX - This really belongs into bsd.port.mk .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= @@ -97,7 +101,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.4 +KDE_VERSION= 3.5.5 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -125,7 +129,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ + QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" .endif # !defined(QT_NONSTANDARD) .else IGNORE= cannot install: unsupported value of USE_QT_VER |