diff options
author | will <will@FreeBSD.org> | 2001-04-03 16:14:43 +0800 |
---|---|---|
committer | will <will@FreeBSD.org> | 2001-04-03 16:14:43 +0800 |
commit | e282c995211fa7d389e4d3b437d0ff892d4d929b (patch) | |
tree | c8e1217a1b00314713ec60f3c0d07c11dc242116 /sysutils | |
parent | a4c43b9975be01621916750b073e7125e629feba (diff) | |
download | freebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.tar.gz freebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.tar.zst freebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.zip |
Overhaul QT/KDE support:
- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}*
- Cleanup corresponding ports for bsd.kde.mk update.
- Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom,
introduce QT_NONSTANDARD variable for nonstandard configure setup.
- Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the
proxy authentication that was broken for 2.1.1. Remove old patches.
- Potentially fix kdelibs build for alpha.
- Fix qt-designer 2.3.0 build.
- Ruby stuff left alone since it looks like black magic to me. Should
still work w/ compat shims for older USE_QT[,2] style. Some others
were also left alone for the same reason.
Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk)
Submitted by: David Faure <faure@kde.org> (proxy auth patches)
Alex Zepeda <garbanzo@kde.org> (old patches removal)
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/kdeadmin/Makefile | 13 | ||||
-rw-r--r-- | sysutils/kdeadmin/distinfo | 2 | ||||
-rw-r--r-- | sysutils/kdeadmin3/Makefile | 13 | ||||
-rw-r--r-- | sysutils/kdeadmin3/distinfo | 2 | ||||
-rw-r--r-- | sysutils/kdeadmin4/Makefile | 13 | ||||
-rw-r--r-- | sysutils/kdeadmin4/distinfo | 2 | ||||
-rw-r--r-- | sysutils/kdf/Makefile | 14 | ||||
-rw-r--r-- | sysutils/kdf/distinfo | 2 | ||||
-rw-r--r-- | sysutils/kfloppy/Makefile | 14 | ||||
-rw-r--r-- | sysutils/kfloppy/distinfo | 2 | ||||
-rw-r--r-- | sysutils/qtpkg/Makefile | 2 | ||||
-rw-r--r-- | sysutils/sweeper/Makefile | 14 | ||||
-rw-r--r-- | sysutils/sweeper/distinfo | 2 |
13 files changed, 19 insertions, 76 deletions
diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile index 092b4af14f9a..44bfaff93fdf 100644 --- a/sysutils/kdeadmin/Makefile +++ b/sysutils/kdeadmin/Makefile @@ -6,26 +6,17 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" .include <bsd.port.mk> diff --git a/sysutils/kdeadmin/distinfo b/sysutils/kdeadmin/distinfo index f3e367713252..caa15fcbc481 100644 --- a/sysutils/kdeadmin/distinfo +++ b/sysutils/kdeadmin/distinfo @@ -1 +1 @@ -MD5 (kdeadmin-2.1.tar.bz2) = 3dee67f67f33b570df935bda3c0631c0 +MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index 092b4af14f9a..44bfaff93fdf 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -6,26 +6,17 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" .include <bsd.port.mk> diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo index f3e367713252..caa15fcbc481 100644 --- a/sysutils/kdeadmin3/distinfo +++ b/sysutils/kdeadmin3/distinfo @@ -1 +1 @@ -MD5 (kdeadmin-2.1.tar.bz2) = 3dee67f67f33b570df935bda3c0631c0 +MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 092b4af14f9a..44bfaff93fdf 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -6,26 +6,17 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" .include <bsd.port.mk> diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo index f3e367713252..caa15fcbc481 100644 --- a/sysutils/kdeadmin4/distinfo +++ b/sysutils/kdeadmin4/distinfo @@ -1 +1 @@ -MD5 (kdeadmin-2.1.tar.bz2) = 3dee67f67f33b570df935bda3c0631c0 +MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 1833fce21603..5e040d99442a 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -6,27 +6,17 @@ # PORTNAME= kdeutils -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 1833fce21603..5e040d99442a 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -6,27 +6,17 @@ # PORTNAME= kdeutils -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/sysutils/kfloppy/distinfo +++ b/sysutils/kfloppy/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/sysutils/qtpkg/Makefile b/sysutils/qtpkg/Makefile index 96bc108df4be..be2422d1e421 100644 --- a/sysutils/qtpkg/Makefile +++ b/sysutils/qtpkg/Makefile @@ -13,7 +13,7 @@ DISTNAME= qtpkg MAINTAINER= twschulz@gloria.cord.edu -USE_QT2= yes +USE_QT_VER= 2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qtpkg ${PREFIX}/sbin diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 1833fce21603..5e040d99442a 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -6,27 +6,17 @@ # PORTNAME= kdeutils -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/sysutils/sweeper/distinfo +++ b/sysutils/sweeper/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 |