diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
| commit | dbba8af6447e625aae93ec45e619acbecb4ab189 (patch) | |
| tree | d696a8c2d3e835a743132aa1f6a5cc0557d1c435 | |
| parent | 683eaaa4ff765b627c52f147501abfaec4449cce (diff) | |
| download | ports-dbba8af6447e625aae93ec45e619acbecb4ab189.tar.gz ports-dbba8af6447e625aae93ec45e619acbecb4ab189.zip | |
Notes
293 files changed, 708 insertions, 1284 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 1f6ddde7860d..ef6ae5d2237c 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -34,51 +34,18 @@ pre-everything:: @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!" .endif -# USE_QT_VER section -.if defined(USE_QT_VER) - -# Qt 1.x common stuff -.if ${USE_QT_VER} == 1 -LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 -USE_NEWGCC= yes -MOC?= ${X11BASE}/bin/moc -.if defined(PREFIX) -QTDIR= ${PREFIX} -.else -QTDIR= ${X11BASE} -.endif -CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" - -.else - -# Qt 2.x common stuff -- DEFAULT -LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 -USE_NEWGCC= yes -QTNAME= qt2 -MOC?= ${X11BASE}/bin/moc2 -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -QTCPPFLAGS= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include -QTCFGLIBS= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ - CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" -.endif -.endif -# End of USE_QT_VER section - # USE_KDELIBS_VER section .if defined(USE_KDELIBS_VER) # kdelibs 1.x common stuff .if ${USE_KDELIBS_VER} == 1 -LIB_DEPENDS+= kdelibs.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS+= kdecore.3:${PORTSDIR}/x11/kdelibs11 USE_QT_VER= 1 .else # kdelibs 2.x common stuff -- DEFAULT -LIB_DEPENDS+= kdelibs.4:${PORTSDIR}/x11/kdelibs2 +LIB_DEPENDS+= kdecore.4:${PORTSDIR}/x11/kdelibs2 USE_QT_VER= 2 .endif @@ -103,4 +70,43 @@ USE_KDELIBS_VER=2 .endif # End of USE_KDEBASE_VER +# USE_QT_VER section +.if defined(USE_QT_VER) + +# Qt 1.x common stuff +.if ${USE_QT_VER} == 1 +LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 +USE_NEWGCC= yes +MOC?= ${X11BASE}/bin/moc +.if defined(PREFIX) +QTDIR= ${PREFIX} +.else +QTDIR= ${X11BASE} +.endif +CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" + +.else + +QTCPPFLAGS?= +QTCFLIBS?= + +# Qt 2.x common stuff -- DEFAULT +LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 +USE_NEWGCC= yes +QTNAME= qt2 +MOC?= ${X11BASE}/bin/moc2 +QTCPPFLAGS+= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \ + -I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2 +QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++ +.if !defined(QT_NONSTANDARD) +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ + CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +.endif +.endif +.endif +# End of USE_QT_VER section + # End of use part. diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 1f6ddde7860d..ef6ae5d2237c 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -34,51 +34,18 @@ pre-everything:: @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!" .endif -# USE_QT_VER section -.if defined(USE_QT_VER) - -# Qt 1.x common stuff -.if ${USE_QT_VER} == 1 -LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 -USE_NEWGCC= yes -MOC?= ${X11BASE}/bin/moc -.if defined(PREFIX) -QTDIR= ${PREFIX} -.else -QTDIR= ${X11BASE} -.endif -CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" - -.else - -# Qt 2.x common stuff -- DEFAULT -LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 -USE_NEWGCC= yes -QTNAME= qt2 -MOC?= ${X11BASE}/bin/moc2 -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -QTCPPFLAGS= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include -QTCFGLIBS= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ - CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" -.endif -.endif -# End of USE_QT_VER section - # USE_KDELIBS_VER section .if defined(USE_KDELIBS_VER) # kdelibs 1.x common stuff .if ${USE_KDELIBS_VER} == 1 -LIB_DEPENDS+= kdelibs.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS+= kdecore.3:${PORTSDIR}/x11/kdelibs11 USE_QT_VER= 1 .else # kdelibs 2.x common stuff -- DEFAULT -LIB_DEPENDS+= kdelibs.4:${PORTSDIR}/x11/kdelibs2 +LIB_DEPENDS+= kdecore.4:${PORTSDIR}/x11/kdelibs2 USE_QT_VER= 2 .endif @@ -103,4 +70,43 @@ USE_KDELIBS_VER=2 .endif # End of USE_KDEBASE_VER +# USE_QT_VER section +.if defined(USE_QT_VER) + +# Qt 1.x common stuff +.if ${USE_QT_VER} == 1 +LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 +USE_NEWGCC= yes +MOC?= ${X11BASE}/bin/moc +.if defined(PREFIX) +QTDIR= ${PREFIX} +.else +QTDIR= ${X11BASE} +.endif +CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" + +.else + +QTCPPFLAGS?= +QTCFLIBS?= + +# Qt 2.x common stuff -- DEFAULT +LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 +USE_NEWGCC= yes +QTNAME= qt2 +MOC?= ${X11BASE}/bin/moc2 +QTCPPFLAGS+= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \ + -I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2 +QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++ +.if !defined(QT_NONSTANDARD) +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ + CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +.endif +.endif +.endif +# End of USE_QT_VER section + # End of use part. diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4a1b18ee67ba..bca063cc3535 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -170,10 +170,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # target. # USE_X_PREFIX - Says that the port installs in ${X11BASE}. Implies USE_XLIB. # USE_XLIB - Says that the port uses X libraries. -# USE_QT - Says that the port uses version 1 of the qt toolkit. -# Implies USE_NEWGCC. -# USE_QT2 - Says that the port uses version 2 of the qt toolkit. -# Implies USE_NEWGCC. # USE_MOTIF - Says that the port uses the Motif toolkit. Implies USE_XPM. # # Dependency checking. Use these if your port requires another port @@ -764,16 +760,6 @@ MANCOMPRESSED?= yes MANCOMPRESSED?= no .endif -.if defined(USE_QT) -LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 -USE_NEWGCC= yes -.endif - -.if defined(USE_QT2) -LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 -USE_NEWGCC= yes -.endif - .if defined(USE_BZIP2) BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif @@ -904,6 +890,10 @@ LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries .endif .endif +.if defined(USE_QT) || defined(USE_QT2) || defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER) +.include "${PORTSDIR}/Mk/bsd.kde.mk" +.endif + .include "${PORTSDIR}/Mk/bsd.gnome.mk" .if exists(${PORTSDIR}/../Makefile.inc) diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/arabic/kde3-i18n/Makefile +++ b/arabic/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/arabic/kde4-l10n/Makefile +++ b/arabic/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 1833fce21603..5e040d99442a 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/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/archivers/ark/distinfo b/archivers/ark/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile index bd1523873cf3..f29b49a4ec41 100644 --- a/astro/xglobe/Makefile +++ b/astro/xglobe/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/ MAINTAINER= kris@FreeBSD.org -USE_QT= yes +USE_QT_VER= 1 USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 994bee691883..d48aa57852fc 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo index dd29a54adee3..7c4c761d571e 100644 --- a/audio/kdemultimedia2/distinfo +++ b/audio/kdemultimedia2/distinfo @@ -1 +1 @@ -MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f +MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294 diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 994bee691883..d48aa57852fc 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index dd29a54adee3..7c4c761d571e 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1 +1 @@ -MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f +MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294 diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile index 019b408d0d92..365b71ff7183 100644 --- a/audio/kmikmod/Makefile +++ b/audio/kmikmod/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ USE_BZIP2= yes WRKSRC= ${WRKDIR}/kmikmod -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes WANT_ESOUND= yes USE_LIBTOOL= yes diff --git a/audio/kmp3/Makefile b/audio/kmp3/Makefile index 065c19f8c388..d64566979953 100644 --- a/audio/kmp3/Makefile +++ b/audio/kmp3/Makefile @@ -12,10 +12,7 @@ MASTER_SITES= http://www.kmp3.org/tarballs/ MAINTAINER= mb@imp.ch -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - QwSpriteField.7:${PORTSDIR}/converters/kdesupport11 - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/kmp3 diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile index 82445a5de404..524ec9a7a648 100644 --- a/audio/kmpg/Makefile +++ b/audio/kmpg/Makefile @@ -13,10 +13,7 @@ MASTER_SITE_SUBDIR= tom MAINTAINER= tom@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile index 1863d8b610d5..2bb38160a5a3 100644 --- a/audio/knapster/Makefile +++ b/audio/knapster/Makefile @@ -14,11 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -RUN_DEPENDS= kdehelp:${PORTSDIR}/x11/kdebase11 - +USE_KDEBASE_VER=1 USE_AUTOCONF= yes USE_GMAKE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/audio/krio/Makefile b/audio/krio/Makefile index 0cdb3892b8fd..189fba2c5daf 100644 --- a/audio/krio/Makefile +++ b/audio/krio/Makefile @@ -14,17 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ak@freenet.co.uk -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 \ - kfile.3:${PORTSDIR}/x11/kdelibs11 -RUN_DEPENDS= kdehelp:${PORTSDIR}/x11/kdebase11 - -USE_QT= yes +USE_KDEBASE_VER=1 HAS_CONFIGURE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ - "--with-qt-includes=${QTDIR}/include/X11/qt" \ - "--with-extra-includes=${LOCALBASE}/include" \ - "--with-extra-libs=${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include .include <bsd.port.mk> diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile index 4306a9b3de13..ce899d8b40e7 100644 --- a/audio/mq3/Makefile +++ b/audio/mq3/Makefile @@ -16,14 +16,13 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ vorbis.0:${PORTSDIR}/audio/libvorbis BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -USE_QT2= yes - +USE_QT_VER= 2 +QT_NONSTANDARD= yes HAS_CONFIGURE= yes MAKE_ENV= CPPFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib}" \ INCDIR_QT="${X11BASE}/include/qt2" \ LIBDIR_QT="${X11BASE}/lib" \ QTDIR="${X11BASE}" - CONFIGURE_ARGS= -prefix ${PREFIX} -platform FreeBSD .include <bsd.port.mk> diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index 3a440095d4d1..f7e3a89ada79 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -16,8 +16,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= trevor@FreeBSD.org RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= qt.3:${PORTSDIR}/x11-toolkits/qt145 +USE_QT_VER= 1 DOCS= ChangeLog README EVAL_PREFIX+= QT1DIR=qt PATH= ${QT1DIR}/qt/bin:$$PATH diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index ffc1a488f6b9..4d2297a68596 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org USE_GMAKE= YES WRKSRC= ${WRKDIR}/${PORTNAME}-0.8/${PORTNAME}-0.8g/ DIST_SUBDIR= xamp -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index f3456bece2c9..c0fbeac02050 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -18,16 +18,11 @@ LIB_DEPENDS= sidplay.1:${PORTSDIR}/audio/libsidplay WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= MOC="${X11BASE}/bin/moc2" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-sidplay-inc=${LOCALBASE}/include \ - --with-sidplay-lib=${LOCALBASE}/lib \ - --with-x-includes=${X11BASE}/include \ - --with-x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+=--with-sidplay-inc=${LOCALBASE}/include \ + --with-sidplay-lib=${LOCALBASE}/lib CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile index effcb47fb615..8067b6b79fb9 100644 --- a/biology/xdrawchem/Makefile +++ b/biology/xdrawchem/Makefile @@ -16,8 +16,7 @@ MAINTAINER= trevor@FreeBSD.org MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" QTDIR="${X11BASE}" PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes -USE_NEWGCC= yes -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 7d2da0e654c9..3d205b4a50c1 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org USE_XLIB= yes -USE_QT2= yes +USE_QT_VER= 2 MAKE_ENV= QTDIR="${X11BASE}" .include <bsd.port.pre.mk> diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile index 7d2da0e654c9..3d205b4a50c1 100644 --- a/cad/qcad2/Makefile +++ b/cad/qcad2/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org USE_XLIB= yes -USE_QT2= yes +USE_QT_VER= 2 MAKE_ENV= QTDIR="${X11BASE}" .include <bsd.port.pre.mk> diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 1833fce21603..5e040d99442a 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/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/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/comms/kremotecontrol/distinfo +++ b/comms/kremotecontrol/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile index c12cecd5ce2c..884a454155fd 100644 --- a/converters/kdesupport11/Makefile +++ b/converters/kdesupport11/Makefile @@ -18,19 +18,12 @@ MAINTAINER= will@FreeBSD.org USE_BZIP2= yes NO_LATEST_LINK= yes -USE_QT= yes +USE_QT_VER= 1 USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --without-libjpeg --without-libgif \ --without-libgdbm --without-libuulib \ --with-qt-includes=${QTDIR}/include/X11/qt -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \ - QTDIR=${QTDIR} - -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif +CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" .include <bsd.port.mk> diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index 1d4896ca12c8..5cc1b3494b30 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -16,21 +16,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_QT_VER= 2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ - --without-audiofile -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" +CONFIGURE_ARGS+=--without-audiofile pre-configure: ${PERL} -pi -e "s@-version-info 1:1@-version-info 3:0@g" ${WRKSRC}/mimelib/Makefile.in diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 1833fce21603..5e040d99442a 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/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/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= 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++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= 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++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= 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++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= 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++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile index 8012ccee7dff..7ddf244c3811 100644 --- a/deskutils/korganizer/Makefile +++ b/deskutils/korganizer/Makefile @@ -11,20 +11,15 @@ CATEGORIES= deskutils kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_BZIP2= yes -USE_QT= yes HAS_CONFIGURE= yes USE_BISON= yes USE_GMAKE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ INSTALL_SCRIPT="install -c -m 555" pre-configure: - ${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache + ${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache .include <bsd.port.mk> diff --git a/deskutils/kproject/Makefile b/deskutils/kproject/Makefile index fffa6691d071..c26c67f38d46 100644 --- a/deskutils/kproject/Makefile +++ b/deskutils/kproject/Makefile @@ -13,10 +13,8 @@ MASTER_SITE_SUBDIR= unstable/apps/office EXTRACT_SUFX= .tgz BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 WRKSRC= ${WRKDIR}/kproject .include <bsd.port.mk> diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 6f29382878cb..25c30b0b03eb 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -13,7 +13,7 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= joep@di.nl -USE_QT= yes +USE_QT_VER= 1 USE_PERL5= yes MAKE_ENV+= QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}" HAS_CONFIGURE= yes diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index ae10737b4ae7..ad30f6a54f78 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR= kdbg/ MAINTAINER= jedgar@FreeBSD.org BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -RUN_DEPENDS= kdehelp:${PORTSDIR}/x11/kdebase11 +USE_KDEBASE_VER=1 GNU_CONFIGURE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/devel/kdelibdocs/Makefile b/devel/kdelibdocs/Makefile index cd682fefc1b7..996430f5d955 100644 --- a/devel/kdelibdocs/Makefile +++ b/devel/kdelibdocs/Makefile @@ -14,11 +14,9 @@ MASTER_SITES= ftp://129.187.206.68/pub/unix/ide/KDevelop/documentation/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS?= kdecore.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= "--with-qtdoc-dir=${X11BASE}/share/doc/qt/html" \ - "--with-qt-includes=${X11BASE}/include/X11/qt" +CONFIGURE_ARGS= "--with-qtdoc-dir=${X11BASE}/share/doc/qt/html" .include <bsd.port.mk> diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile index cbade25bd470..8cd3104f3c08 100644 --- a/devel/kdesdk/Makefile +++ b/devel/kdesdk/Makefile @@ -13,19 +13,10 @@ 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 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++" USE_GMAKE= yes MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index cbade25bd470..8cd3104f3c08 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -13,19 +13,10 @@ 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 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++" USE_GMAKE= yes MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index cbade25bd470..8cd3104f3c08 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -13,19 +13,10 @@ 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 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++" USE_GMAKE= yes MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 diff --git a/devel/kdestudio/Makefile b/devel/kdestudio/Makefile index dffea51cdeeb..c8fcfa149f7c 100644 --- a/devel/kdestudio/Makefile +++ b/devel/kdestudio/Makefile @@ -13,19 +13,10 @@ MASTER_SITES= ftp://ftp.thekompany.com/pub/KDE_Studio/source/ \ MAINTAINER= twschulz@cord.edu -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 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++" pre-configure: @/usr/bin/find ${WRKSRC} -name Makefile.in | /usr/bin/xargs ${PERL} -pi -e "s/CXXFLAGS = -O2 -Wall/#CXXFLAGS = do not touch me/" diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 11e61460e5a0..4fbda9235e40 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,16 +6,14 @@ # PORTNAME= kdevelop -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/2.1/distribution/tar/generic/src +MASTER_SITE_SUBDIR= stable/2.1.1/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake .if defined(WITH_OPTIONAL_DEPENDS) RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ @@ -32,19 +30,12 @@ RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ a2ps:${PORTSDIR}/print/a2ps43-letter .endif +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_GMAKE= yes USE_AUTOCONF= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html \ - --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++" +CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html pre-everything:: .if !defined(WITH_OPTIONAL_DEPENDS) diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index 48e73cdfac63..75c657027125 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1 +1 @@ -MD5 (kdevelop-1.4.tar.bz2) = d5f2b10a390bb888654b85b29bd3f07e +MD5 (kdevelop-1.4.1.tar.bz2) = 7e7bf0bb436c5d868e068291b2176208 diff --git a/devel/kpp/Makefile b/devel/kpp/Makefile index 9434a58765d4..c19d87c1fe06 100644 --- a/devel/kpp/Makefile +++ b/devel/kpp/Makefile @@ -12,10 +12,8 @@ MASTER_SITES= http://www.msoe.edu/~geiseri/files/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes -USE_QT= yes CONFIGURE_ARGS+=--datadir=${PREFIX} CONFIGURE_ENV= KDEDIR="${PREFIX}" diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile index dcf4f0fe0337..e76d8dbb2aac 100644 --- a/devel/ktranslator/Makefile +++ b/devel/ktranslator/Makefile @@ -14,16 +14,13 @@ MASTER_SITE_SUBDIR= Attic/old/1.1.2/apps/utils MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_AUTOMAKE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt \ - --with-extra-includes=${LOCALBASE}/include \ - --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include post-patch: @cd ${WRKSRC} && aclocal diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile index 31ff0bf263d5..65b4461e6afd 100644 --- a/devel/lincvs/Makefile +++ b/devel/lincvs/Makefile @@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= jedgar@FreeBSD.org -USE_QT2= yes +USE_QT_VER= 2 WRKSRC= ${WRKDIR}/LinCVS-0.2.3 do-configure: diff --git a/devel/linguist/Makefile b/devel/linguist/Makefile index 6115102291c8..028dc1f64ac9 100644 --- a/devel/linguist/Makefile +++ b/devel/linguist/Makefile @@ -17,15 +17,14 @@ BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ENV= TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \ QTDIR="${X11BASE}" MAKE_ENV= TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \ - QTDIR="${X11BASE}" \ - MOC="${X11BASE}/bin/moc2" + QTDIR="${X11BASE}" MAKE_ARGS= -e .include <bsd.port.pre.mk> diff --git a/devel/moonshine/Makefile b/devel/moonshine/Makefile index 76c5424effd8..53cdb3f31c06 100644 --- a/devel/moonshine/Makefile +++ b/devel/moonshine/Makefile @@ -13,13 +13,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= sobomax@FreeBSD.org -USE_QT2= yes +USE_QT_VER= 2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${X11BASE}/include - -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include <bsd.port.pre.mk> diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile index cee1a28b0250..0ca0b97b5d70 100644 --- a/devel/qt-designer/Makefile +++ b/devel/qt-designer/Makefile @@ -10,6 +10,12 @@ MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23 PORTNAME= qt-designer CATEGORIES= devel +post-patch: + ${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG} + +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + .include "${MASTERDIR}/Makefile" LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa index 119251bcb772..695099386459 100644 --- a/devel/qt-designer/files/patch-aa +++ b/devel/qt-designer/files/patch-aa @@ -5,7 +5,7 @@ # Compiling with support libraries SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include -I/usr/X11R6/include/qt2 $(SYSCONF_CXXFLAGS_THREAD) ++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include # Compiling YACC output @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/devel/qtarch/Makefile b/devel/qtarch/Makefile index a7e33025d9c3..b5cd729a4e72 100644 --- a/devel/qtarch/Makefile +++ b/devel/qtarch/Makefile @@ -13,10 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= elwood@mc5sys.in-berlin.de -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_XLIB= yes WRKSRC= ${WRKDIR}/qtarch-1.4 diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile index a9fb8ad62721..2058f2a40d5c 100644 --- a/devel/qtez/Makefile +++ b/devel/qtez/Makefile @@ -16,12 +16,11 @@ MAINTAINER= ports@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes -USE_QT2= yes +USE_QT_VER= 2 USE_AUTOMAKE= yes AUTOMAKE= automake -a -i && ${PERL} automoc USE_LIBTOOL= yes -CONFIGURE_ENV= QTDIR="${X11BASE}" MOC="${X11BASE}/bin/moc2" \ - QTEZ="${PREFIX}/share/qtez" +CONFIGURE_ENV= QTDIR="${X11BASE}" QTEZ="${PREFIX}/share/qtez" MAKE_ENV= QTEZ="${PREFIX}/share/qtez" INSTALLS_SHLIB= yes diff --git a/devel/sip/Makefile b/devel/sip/Makefile index ec5a25f8c783..3101293afe2c 100644 --- a/devel/sip/Makefile +++ b/devel/sip/Makefile @@ -15,9 +15,9 @@ MAINTAINER= adsharma@sharmas.dhs.org USE_PYTHON= yes USE_LIBTOOL= yes USE_GMAKE= yes -USE_QT2= yes +USE_QT_VER= 2 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --enable-qt --with-qt-includes=${X11BASE}/include/qt2 +CONFIGURE_ARGS= --enable-qt CONFIGURE_ENV= LDFLAGS=-lgcc .include <bsd.port.mk> diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile index d59e7d04f686..dd62e8628c6c 100644 --- a/devel/tmake/Makefile +++ b/devel/tmake/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.trolltech.com/freebies/tmake/ MAINTAINER= jesse@cs.uni-magdeburg.de USE_PERL5= yes -USE_QT2= yes +USE_QT_VER= 2 NO_BUILD= yes TMAKE_BIN= progen tmake diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/editors/fine/Makefile b/editors/fine/Makefile index 1f59a6eee76f..7321fbef4d53 100644 --- a/editors/fine/Makefile +++ b/editors/fine/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org -USE_NEWGCC= yes USE_GMAKE= yes -USE_QT2= yes +USE_QT_VER= 2 WRKSRC= ${WRKDIR}/fine .include <bsd.port.pre.mk> diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/emulators/kmamerun/Makefile b/emulators/kmamerun/Makefile index 8fd0138d8ec2..89e49aea1fb4 100644 --- a/emulators/kmamerun/Makefile +++ b/emulators/kmamerun/Makefile @@ -14,11 +14,9 @@ DISTNAME= kmamerun-0.3.0pre1 MAINTAINER= nsayer@freebsd.org RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes -USE_QT= yes CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ INSTALL_SCRIPT="install -c -m 555" diff --git a/emulators/ksnes9x/Makefile b/emulators/ksnes9x/Makefile index b0861835e537..c37b51d307fb 100644 --- a/emulators/ksnes9x/Makefile +++ b/emulators/ksnes9x/Makefile @@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR= ksnes9x MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index e57c2700839f..1fe96dd7ebc5 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" diff --git a/ftp/caitoo/Makefile b/ftp/caitoo/Makefile index 1e0f4ddd2fff..2dabbe42b9ed 100644 --- a/ftp/caitoo/Makefile +++ b/ftp/caitoo/Makefile @@ -14,14 +14,8 @@ MASTER_SITE_SUBDIR= unstable/apps/network MAINTAINER= lioux@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfile.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 \ - mediatool.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_XLIB= yes -USE_QT= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile index 56dbc39bd396..e4f584e83dc6 100644 --- a/games/blackjack/Makefile +++ b/games/blackjack/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT= yes +USE_QT_VER= 1 MAN1= blackjack.1 diff --git a/games/kbubbles/Makefile b/games/kbubbles/Makefile index 25a27687996f..097a4961e9d9 100644 --- a/games/kbubbles/Makefile +++ b/games/kbubbles/Makefile @@ -13,10 +13,8 @@ MASTER_SITES= http://hem.passagen.se/tonybj/kbubbles/ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= QwSpriteField.7:${PORTSDIR}/converters/kdesupport11 \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 +USE_KDELIBS_VER=1 USE_LIBTOOL= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 2f10e12bb138..84cce965cc68 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -6,26 +6,16 @@ # PORTNAME= kdegames -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= games 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 -USE_NEWGCC= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/kdegames2/distinfo b/games/kdegames2/distinfo index e86d731eca29..07ebe258a73d 100644 --- a/games/kdegames2/distinfo +++ b/games/kdegames2/distinfo @@ -1 +1 @@ -MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7 +MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9 diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 2f10e12bb138..84cce965cc68 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -6,26 +6,16 @@ # PORTNAME= kdegames -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= games 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 -USE_NEWGCC= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index e86d731eca29..07ebe258a73d 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1 +1 @@ -MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7 +MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9 diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 2f10e12bb138..84cce965cc68 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -6,26 +6,16 @@ # PORTNAME= kdegames -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= games 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 -USE_NEWGCC= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index e86d731eca29..07ebe258a73d 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1 +1 @@ -MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7 +MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9 diff --git a/games/krogue/Makefile b/games/krogue/Makefile index 0754886b6942..53469cf796d7 100644 --- a/games/krogue/Makefile +++ b/games/krogue/Makefile @@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ENV= QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt .include <bsd.port.mk> diff --git a/games/krubik/Makefile b/games/krubik/Makefile index f5c03ed60cb1..c6fa50d6a7b6 100644 --- a/games/krubik/Makefile +++ b/games/krubik/Makefile @@ -13,9 +13,8 @@ MASTER_SITES= http://www.phys.uu.nl/~eendebak/kde/ MAINTAINER= jedgar@fxp.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/games/ktamaga/Makefile b/games/ktamaga/Makefile index 7a8065ca32db..1c300b3aeb9d 100644 --- a/games/ktamaga/Makefile +++ b/games/ktamaga/Makefile @@ -13,10 +13,8 @@ MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/unstable/apps/games/ \ MAINTAINER= se@freebsd.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 +USE_KDELIBS_VER=1 MAKE_ENV= DEBUG_FL="$(CFLAGS)" - -USE_QT= yes WRKSRC= ${WRKDIR}/tamaga-0.2 .include <bsd.port.mk> diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index c6c5f6ebed9b..bd00c19924c3 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -25,7 +25,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz -USE_QT= yes +USE_QT_VER= 1 USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile index c6c5f6ebed9b..bd00c19924c3 100644 --- a/games/nethack33-qt/Makefile +++ b/games/nethack33-qt/Makefile @@ -25,7 +25,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz -USE_QT= yes +USE_QT_VER= 1 USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile index c6c5f6ebed9b..bd00c19924c3 100644 --- a/games/nethack34-qt/Makefile +++ b/games/nethack34-qt/Makefile @@ -25,7 +25,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz -USE_QT= yes +USE_QT_VER= 1 USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/pp/Makefile b/games/pp/Makefile index a67f7dcbf18c..e7a48d6860d9 100644 --- a/games/pp/Makefile +++ b/games/pp/Makefile @@ -14,7 +14,7 @@ DISTFILES= ppinst-0.01.tar.gz ppsrc-0.01.tar.gz MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/ppsrc -USE_QT= yes +USE_QT_VER= 1 USE_X_PREFIX= yes do-install: diff --git a/games/xlines/Makefile b/games/xlines/Makefile index 32e110f05634..4513faeefcf8 100644 --- a/games/xlines/Makefile +++ b/games/xlines/Makefile @@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -USE_QT= yes +USE_QT_VER= 1 USE_X_PREFIX= yes NO_WRKSUBDIR= yes diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile index 5a41ad1ef4a2..f1476632e523 100644 --- a/graphics/avifile/Makefile +++ b/graphics/avifile/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} ONLY_FOR_ARCHS= i386 -USE_QT2= yes +USE_QT_VER= 2 USE_XLIB= yes USE_GMAKE= yes INSTALLS_SHLIB= yes @@ -28,11 +28,8 @@ USE_AUTOCONF= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - MOC="${MOC}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-win32-path=${LOCALBASE}/lib/win32 \ +CONFIGURE_ARGS= --with-win32-path=${LOCALBASE}/lib/win32 \ --enable-release PLIST_SUB= LIB_VERSION="${LIB_VERSION}" @@ -50,7 +47,6 @@ LIB_VERSION= 0 EXTRA_BUILD_DIR= player samples/benchmark samples/qtrecompress SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config -MOC?= ${X11BASE}/bin/moc2 DIFF?= /usr/bin/diff .include <bsd.port.pre.mk> diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile index 166c91e5f305..552dabdf20cd 100644 --- a/graphics/ecg2png/Makefile +++ b/graphics/ecg2png/Makefile @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd -USE_QT2= yes +USE_QT_VER= 2 WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/qt2 -I${LOCALBASE}/include/gd" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +QTCPPFLAGS+= -I/usr/local/include/gd USE_GMAKE= yes USE_AUTOMAKE= yes diff --git a/graphics/imanager/Makefile b/graphics/imanager/Makefile index e1a456dd5edf..55adc3d7088a 100644 --- a/graphics/imanager/Makefile +++ b/graphics/imanager/Makefile @@ -13,10 +13,9 @@ DISTNAME= imanager-${PORTVERSION}.final.imlib MAINTAINER= ports@freebsd.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib -USE_QT= yes +USE_KDELIBS_VER=1 HAS_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index 5cd06a85e3bc..193b12e8e9e0 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -6,28 +6,20 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= graphics 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 BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--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/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo index a61e71638f8d..dbb28870f30f 100644 --- a/graphics/kdegraphics2/distinfo +++ b/graphics/kdegraphics2/distinfo @@ -1 +1 @@ -MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33 +MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58 diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 5cd06a85e3bc..193b12e8e9e0 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -6,28 +6,20 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= graphics 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 BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--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/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index a61e71638f8d..dbb28870f30f 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1 +1 @@ -MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33 +MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58 diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 5cd06a85e3bc..193b12e8e9e0 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -6,28 +6,20 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= graphics 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 BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--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/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index a61e71638f8d..dbb28870f30f 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1 +1 @@ -MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33 +MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58 diff --git a/graphics/killustrator/Makefile b/graphics/killustrator/Makefile index 925f1fde5d9f..cdf8f6b84b02 100644 --- a/graphics/killustrator/Makefile +++ b/graphics/killustrator/Makefile @@ -12,12 +12,10 @@ MASTER_SITES= http://wwwiti.cs.uni-magdeburg.de/~sattler/pub/killustrator/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - intl.1:${PORTSDIR}/devel/gettext \ +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -RUN_DEPENDS= ${LOCALBASE}/bin/kdehelp:${PORTSDIR}/x11/kdebase11 -USE_QT= yes +USE_KDEBASE_VER=1 USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" diff --git a/graphics/kplot3d/Makefile b/graphics/kplot3d/Makefile index 4b59c7ae7a69..72bb0acc5b66 100644 --- a/graphics/kplot3d/Makefile +++ b/graphics/kplot3d/Makefile @@ -12,9 +12,7 @@ MASTER_SITES= http://members.nbci.com/kplot3d/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index 671831e5dcc5..a6fb0436a6ea 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -16,7 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= 3ds.0:${PORTSDIR}/graphics/lib3ds USE_X_PREFIX= yes -USE_QT2= yes +USE_QT_VER= 2 USE_MESA= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/hebrew/kde3-i18n/Makefile +++ b/hebrew/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/hebrew/kde4-l10n/Makefile +++ b/hebrew/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/hungarian/kde3-i18n/Makefile +++ b/hungarian/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/hungarian/kde4-l10n/Makefile +++ b/hungarian/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile index 5aa73ae132d4..006fe6b8693d 100644 --- a/irc/kvirc-devel/Makefile +++ b/irc/kvirc-devel/Makefile @@ -22,8 +22,7 @@ MAN1= kvirc.1 USE_LIBTOOL= yes USE_AUTOMAKE= yes USE_AUTOCONF= yes -USE_NEWGCC= yes -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes USE_GMAKE= yes CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \ diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 5aa73ae132d4..006fe6b8693d 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -22,8 +22,7 @@ MAN1= kvirc.1 USE_LIBTOOL= yes USE_AUTOMAKE= yes USE_AUTOCONF= yes -USE_NEWGCC= yes -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes USE_GMAKE= yes CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \ diff --git a/japanese/kebook/Makefile b/japanese/kebook/Makefile index d54bbba8c179..b26cbc06bec5 100644 --- a/japanese/kebook/Makefile +++ b/japanese/kebook/Makefile @@ -13,16 +13,13 @@ MASTER_SITES= http://www.os.rim.or.jp/~s_mitu/library/kebook/ \ MAINTAINER= hige@higesoft.os.rim.or.jp -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - eb.3:${PORTSDIR}/japanese/eb +LIB_DEPENDS= eb.3:${PORTSDIR}/japanese/eb BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -RUN_DEPENDS= kfm:${PORTSDIR}/x11/kdebase11 +USE_KDEBASE_VER=1 USE_BZIP2= yes USE_GMAKE= yes -USE_NEWGCC= yes USE_LIBTOOL= yes -USE_QT= yes CONFIGURE_ARGS= "--with-qt-dir=${QTDIR}" \ "--with-qt-includes=${QTDIR}/include/X11/qt" \ diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 2411495c925e..df57bd6ebf9b 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://granroth.kde.org/kbiff/ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT= yes +USE_KDELIBS_VER=1 USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/mail/knewmail/Makefile b/mail/knewmail/Makefile index 08e10264e7cc..7d1594388253 100644 --- a/mail/knewmail/Makefile +++ b/mail/knewmail/Makefile @@ -13,11 +13,9 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= wellers@netvision.net.il -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 HAS_CONFIGURE= yes KDEDIR= ${PREFIX} -USE_QT= yes CONFIGURE_ARGS= --prefix=${PREFIX} .include <bsd.port.mk> diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 1833fce21603..5e040d99442a 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/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/math/kcalc/distinfo b/math/kcalc/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile index 5a39985da8f0..7ce80a21b125 100644 --- a/math/xgfe/Makefile +++ b/math/xgfe/Makefile @@ -15,7 +15,7 @@ MAINTAINER= mph@freebsd.org RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -USE_QT= yes +USE_QT_VER= 1 USE_X_PREFIX= yes MAKE_ENV= X11BASE=$(X11BASE) PREFIX=$(PREFIX) diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile index f09727545c4e..fc7eacbb2856 100644 --- a/misc/bidwatcher/Makefile +++ b/misc/bidwatcher/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.midwestcs.com/bidwatcher/download/ MAINTAINER= mph@FreeBSD.org USE_GMAKE= YES -USE_QT= YES +USE_QT_VER= 1 MAKE_ENV= QTDIR=${X11BASE}/include/X11/qt \ SYSCONF_LFLAGS_QT=${X11BASE}/lib \ SYSCONF_MOC=${X11BASE}/bin/moc diff --git a/misc/kde2-i18n/Makefile b/misc/kde2-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde2-i18n/Makefile +++ b/misc/kde2-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-af/Makefile +++ b/misc/kde3-i18n-af/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-ar/Makefile +++ b/misc/kde3-i18n-ar/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-az/Makefile +++ b/misc/kde3-i18n-az/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-bg/Makefile +++ b/misc/kde3-i18n-bg/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-bs/Makefile +++ b/misc/kde3-i18n-bs/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-ca/Makefile +++ b/misc/kde3-i18n-ca/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-cs/Makefile +++ b/misc/kde3-i18n-cs/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-da/Makefile +++ b/misc/kde3-i18n-da/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-el/Makefile +++ b/misc/kde3-i18n-el/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-en_GB/Makefile +++ b/misc/kde3-i18n-en_GB/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-eo/Makefile +++ b/misc/kde3-i18n-eo/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-es/Makefile +++ b/misc/kde3-i18n-es/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-et/Makefile +++ b/misc/kde3-i18n-et/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-fi/Makefile +++ b/misc/kde3-i18n-fi/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-he/Makefile b/misc/kde3-i18n-he/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-he/Makefile +++ b/misc/kde3-i18n-he/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-hr/Makefile +++ b/misc/kde3-i18n-hr/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-hu/Makefile b/misc/kde3-i18n-hu/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-hu/Makefile +++ b/misc/kde3-i18n-hu/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-id/Makefile +++ b/misc/kde3-i18n-id/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-is/Makefile +++ b/misc/kde3-i18n-is/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-it/Makefile +++ b/misc/kde3-i18n-it/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-lt/Makefile +++ b/misc/kde3-i18n-lt/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-lv/Makefile +++ b/misc/kde3-i18n-lv/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-mt/Makefile +++ b/misc/kde3-i18n-mt/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-nb/Makefile +++ b/misc/kde3-i18n-nb/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-nl/Makefile +++ b/misc/kde3-i18n-nl/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-nn/Makefile +++ b/misc/kde3-i18n-nn/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-pl/Makefile +++ b/misc/kde3-i18n-pl/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-pt/Makefile b/misc/kde3-i18n-pt/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-pt/Makefile +++ b/misc/kde3-i18n-pt/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-pt_BR/Makefile b/misc/kde3-i18n-pt_BR/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-pt_BR/Makefile +++ b/misc/kde3-i18n-pt_BR/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-ro/Makefile +++ b/misc/kde3-i18n-ro/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-sk/Makefile +++ b/misc/kde3-i18n-sk/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-sl/Makefile +++ b/misc/kde3-i18n-sl/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-sr/Makefile +++ b/misc/kde3-i18n-sr/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-sv/Makefile +++ b/misc/kde3-i18n-sv/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-ta/Makefile +++ b/misc/kde3-i18n-ta/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-th/Makefile +++ b/misc/kde3-i18n-th/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-tr/Makefile +++ b/misc/kde3-i18n-tr/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-ven/Makefile +++ b/misc/kde3-i18n-ven/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-vi/Makefile b/misc/kde3-i18n-vi/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-vi/Makefile +++ b/misc/kde3-i18n-vi/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-xh/Makefile +++ b/misc/kde3-i18n-xh/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n-zu/Makefile +++ b/misc/kde3-i18n-zu/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde3-i18n/Makefile +++ b/misc/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-i18n-is/Makefile +++ b/misc/kde4-i18n-is/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-bg/Makefile +++ b/misc/kde4-l10n-bg/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-ca/Makefile +++ b/misc/kde4-l10n-ca/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-cs/Makefile +++ b/misc/kde4-l10n-cs/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-da/Makefile +++ b/misc/kde4-l10n-da/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-el/Makefile +++ b/misc/kde4-l10n-el/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-en_GB/Makefile +++ b/misc/kde4-l10n-en_GB/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-eo/Makefile +++ b/misc/kde4-l10n-eo/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-es/Makefile +++ b/misc/kde4-l10n-es/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-et/Makefile +++ b/misc/kde4-l10n-et/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-fi/Makefile +++ b/misc/kde4-l10n-fi/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-is/Makefile +++ b/misc/kde4-l10n-is/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-it/Makefile +++ b/misc/kde4-l10n-it/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-lt/Makefile +++ b/misc/kde4-l10n-lt/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-lv/Makefile +++ b/misc/kde4-l10n-lv/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-nb/Makefile +++ b/misc/kde4-l10n-nb/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-nl/Makefile +++ b/misc/kde4-l10n-nl/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-nn/Makefile +++ b/misc/kde4-l10n-nn/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-ro/Makefile +++ b/misc/kde4-l10n-ro/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-sk/Makefile +++ b/misc/kde4-l10n-sk/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-sl/Makefile +++ b/misc/kde4-l10n-sl/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-sr/Makefile +++ b/misc/kde4-l10n-sr/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-sv/Makefile +++ b/misc/kde4-l10n-sv/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-ta/Makefile +++ b/misc/kde4-l10n-ta/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-th/Makefile +++ b/misc/kde4-l10n-th/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n-tr/Makefile +++ b/misc/kde4-l10n-tr/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/misc/kde4-l10n/Makefile +++ b/misc/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 1833fce21603..5e040d99442a 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/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/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/misc/kdeutils2/distinfo +++ b/misc/kdeutils2/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 1833fce21603..5e040d99442a 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/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/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 1833fce21603..5e040d99442a 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/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/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/misc/kdirstat/Makefile b/misc/kdirstat/Makefile index ad52933dc237..0c987a42e750 100644 --- a/misc/kdirstat/Makefile +++ b/misc/kdirstat/Makefile @@ -15,10 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= andrey@novikov.com -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/misc/khotkeys/Makefile b/misc/khotkeys/Makefile index f4ec5985b049..83a6b1807ea8 100644 --- a/misc/khotkeys/Makefile +++ b/misc/khotkeys/Makefile @@ -12,26 +12,11 @@ MASTER_SITES= http://dforce.sh.cvut.cz/~seli/en/khotkeys/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 \ - kfile.3:${PORTSDIR}/x11/kdelibs11 -RUN_DEPENDS= kcontrol:${PORTSDIR}/x11/kdebase11 - +USE_KDEBASE_VER=1 NO_LATEST_LINK= yes USE_BZIP2= yes USE_GMAKE= yes -USE_NEWGCC= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= "--with-qt-includes=${QTDIR}/include/X11/qt" \ - "--with-extra-includes=${LOCALBASE}/include" \ - "--with-extra-libs=${LOCALBASE}/lib" -CONFIGURE_ENV= MOC=${X11BASE}/bin/moc QTDIR=${QTDIR} - -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif +CONFIGURE_ARGS= "--with-extra-includes=${LOCALBASE}/include" .include <bsd.port.mk> diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile index 213fba73c7e4..b93f538786d3 100644 --- a/misc/kwatch/Makefile +++ b/misc/kwatch/Makefile @@ -13,10 +13,7 @@ MASTER_SITE_SUBDIR= system/admin/frontends MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/misc/libh/Makefile b/misc/libh/Makefile index 11d34efb9b88..549ac965ce5c 100644 --- a/misc/libh/Makefile +++ b/misc/libh/Makefile @@ -18,9 +18,9 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \ tvision.0:${PORTSDIR}/devel/tvision BUILD_DEPENDS= ${X11BASE}/lib/libqt2.a:${PORTSDIR}/x11-toolkits/qt2-static -USE_QT2=yes -IS_INTERACTIVE=yes -INSTALLS_SHLIB=yes +USE_QT_VER= 2 +IS_INTERACTIVE= yes +INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> diff --git a/misc/peq/Makefile b/misc/peq/Makefile index 84d8dbeb0953..e58990b2abed 100644 --- a/misc/peq/Makefile +++ b/misc/peq/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://silverstone.fortunecity.com/jaguar/37/ \ MAINTAINER= gvg@uunet.co.za -USE_QT= yes +USE_QT_VER= 1 post-install: strip ${PREFIX}/bin/peq diff --git a/misc/qhacc/Makefile b/misc/qhacc/Makefile index e57c2700839f..1fe96dd7ebc5 100644 --- a/misc/qhacc/Makefile +++ b/misc/qhacc/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 5a41ad1ef4a2..f1476632e523 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} ONLY_FOR_ARCHS= i386 -USE_QT2= yes +USE_QT_VER= 2 USE_XLIB= yes USE_GMAKE= yes INSTALLS_SHLIB= yes @@ -28,11 +28,8 @@ USE_AUTOCONF= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - MOC="${MOC}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-win32-path=${LOCALBASE}/lib/win32 \ +CONFIGURE_ARGS= --with-win32-path=${LOCALBASE}/lib/win32 \ --enable-release PLIST_SUB= LIB_VERSION="${LIB_VERSION}" @@ -50,7 +47,6 @@ LIB_VERSION= 0 EXTRA_BUILD_DIR= player samples/benchmark samples/qtrecompress SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config -MOC?= ${X11BASE}/bin/moc2 DIFF?= /usr/bin/diff .include <bsd.port.pre.mk> diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 994bee691883..d48aa57852fc 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index dd29a54adee3..7c4c761d571e 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1 +1 @@ -MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f +MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294 diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 994bee691883..d48aa57852fc 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index dd29a54adee3..7c4c761d571e 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1 +1 @@ -MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f +MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294 diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 3d5f273dcc50..5fc3130f8b56 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -19,14 +19,12 @@ MAINTAINER= green@FreeBSD.org BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes USE_AUTOCONF= yes -USE_NEWGCC= yes USE_OPENSSL= yes USE_PERL5= yes -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL) post-patch: diff --git a/net/icqnix/Makefile b/net/icqnix/Makefile index 252080d7ce00..2b902ecfbafa 100644 --- a/net/icqnix/Makefile +++ b/net/icqnix/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= esdplay:${PORTSDIR}/audio/esound GNU_CONFIGURE= yes USE_GMAKE= yes -USE_QT= yes +USE_QT_VER= 1 post-install: @strip ${PREFIX}/bin/icqnix diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 04ee0ab8718c..b4c8527e3d10 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -6,27 +6,19 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \ - kdecore.4:${PORTSDIR}/x11/kdelibs2 +LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo index 75dc4a4ac432..505dde8f6f5b 100644 --- a/net/kdenetwork2/distinfo +++ b/net/kdenetwork2/distinfo @@ -1 +1 @@ -MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad +MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136 diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 04ee0ab8718c..b4c8527e3d10 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -6,27 +6,19 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \ - kdecore.4:${PORTSDIR}/x11/kdelibs2 +LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 75dc4a4ac432..505dde8f6f5b 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1 +1 @@ -MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad +MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136 diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 04ee0ab8718c..b4c8527e3d10 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -6,27 +6,19 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \ - kdecore.4:${PORTSDIR}/x11/kdelibs2 +LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes pre-configure: diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 75dc4a4ac432..505dde8f6f5b 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1 +1 @@ -MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad +MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136 diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile index 296c560ee2ef..d331a451b223 100644 --- a/net/kdetelnet/Makefile +++ b/net/kdetelnet/Makefile @@ -14,15 +14,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_AUTOMAKE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt \ - --with-extra-includes=${X11BASE}/include \ - --with-extra-libs=${LOCALBASE}/lib \ +CONFIGURE_ARGS= --with-extra-includes=${X11BASE}/include \ --program-transform-name='s,k,kde,' post-extract: diff --git a/net/kicq/Makefile b/net/kicq/Makefile index 0671c4753b4b..160fc754687a 100644 --- a/net/kicq/Makefile +++ b/net/kicq/Makefile @@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org -LIB_DEPENDS= icq.1:${PORTSDIR}/net/icqlib \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS= icq.1:${PORTSDIR}/net/icqlib -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net/kmud/Makefile b/net/kmud/Makefile index db65b8d5058d..49e192c2a71c 100644 --- a/net/kmud/Makefile +++ b/net/kmud/Makefile @@ -14,17 +14,13 @@ MASTER_SITE_SUBDIR= games/muds MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= kdehelp:${PORTSDIR}/x11/kdebase11 -USE_QT= yes +USE_KDEBASE_VER=1 USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ QTDIR="${X11BASE}" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt \ - --with-qt-libraries=${X11BASE}/lib pre-patch: @${PERL} -pi -e "s|-ldl ||g" ${WRKSRC}/kmud/Makefile.in diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile index 8be924f7e433..ffb3635299d8 100644 --- a/net/ksamba/Makefile +++ b/net/ksamba/Makefile @@ -13,9 +13,8 @@ MASTER_SITES= ${MASTER_SITE_KDE} \ MASTER_SITE_SUBDIR= unstable/apps/network BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_AUTOMAKE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" \ diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile index a4b23ac103a8..f8894397b174 100644 --- a/net/kxicq-devel/Makefile +++ b/net/kxicq-devel/Makefile @@ -13,11 +13,9 @@ DISTNAME= ${PORTNAME}-03132000 MAINTAINER= andrey@novikov.com -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_LIBTOOL= yes -USE_QT= yes DIST_SUBDIR= kxicq diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index a4b23ac103a8..f8894397b174 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -13,11 +13,9 @@ DISTNAME= ${PORTNAME}-03132000 MAINTAINER= andrey@novikov.com -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_GMAKE= yes USE_LIBTOOL= yes -USE_QT= yes DIST_SUBDIR= kxicq diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile index 3d5f273dcc50..5fc3130f8b56 100644 --- a/net/licq-devel/Makefile +++ b/net/licq-devel/Makefile @@ -19,14 +19,12 @@ MAINTAINER= green@FreeBSD.org BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes USE_AUTOCONF= yes -USE_NEWGCC= yes USE_OPENSSL= yes USE_PERL5= yes -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL) post-patch: diff --git a/net/licq/Makefile b/net/licq/Makefile index 3d5f273dcc50..5fc3130f8b56 100644 --- a/net/licq/Makefile +++ b/net/licq/Makefile @@ -19,14 +19,12 @@ MAINTAINER= green@FreeBSD.org BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes USE_AUTOCONF= yes -USE_NEWGCC= yes USE_OPENSSL= yes USE_PERL5= yes -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL) post-patch: diff --git a/net/pppload/Makefile b/net/pppload/Makefile index 78ffd44a02c6..0fca107fb16e 100644 --- a/net/pppload/Makefile +++ b/net/pppload/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= system/network/serial/ppp MAINTAINER= ports@FreeBSD.org -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes MAN1= pppload.1 diff --git a/news/krn/Makefile b/news/krn/Makefile index 0585a2d78817..9f71c4ac5018 100644 --- a/news/krn/Makefile +++ b/news/krn/Makefile @@ -13,12 +13,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= adsharma@sharmas.dhs.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - uu.1:${PORTSDIR}/converters/uulib \ - mimelib.2:${PORTSDIR}/converters/kdesupport11 \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile index a1bdec02755e..578e589b4184 100644 --- a/palm/kpilot/Makefile +++ b/palm/kpilot/Makefile @@ -12,10 +12,7 @@ MASTER_SITES= http://www.slac.com/pilone/kpilot_home/download/ MAINTAINER= dima@freebsd.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 KDEDIR?= $(PREFIX) USE_LIBTOOL= yes USE_GMAKE= yes diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/polish/kde3-i18n/Makefile +++ b/polish/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/polish/kde4-l10n/Makefile +++ b/polish/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/ports-mgmt/qtpkg/Makefile b/ports-mgmt/qtpkg/Makefile index 96bc108df4be..be2422d1e421 100644 --- a/ports-mgmt/qtpkg/Makefile +++ b/ports-mgmt/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/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/portuguese/kde3-i18n-pt_BR/Makefile +++ b/portuguese/kde3-i18n-pt_BR/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/portuguese/kde3-i18n/Makefile +++ b/portuguese/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/portuguese/kde4-l10n-pt_BR/Makefile +++ b/portuguese/kde4-l10n-pt_BR/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/portuguese/kde4-l10n/Makefile +++ b/portuguese/kde4-l10n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/print/klyx/Makefile b/print/klyx/Makefile index e33b66e1d182..22768024ae59 100644 --- a/print/klyx/Makefile +++ b/print/klyx/Makefile @@ -13,9 +13,7 @@ MASTER_SITE_SUBDIR= unstable/apps/office MAINTAINER= tom@eborcom.com -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 1833fce21603..5e040d99442a 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/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/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/security/kgpg-kde4/distinfo +++ b/security/kgpg-kde4/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/security/kmap/Makefile b/security/kmap/Makefile index cad40e91363a..6bb18cefc95d 100644 --- a/security/kmap/Makefile +++ b/security/kmap/Makefile @@ -13,11 +13,10 @@ MASTER_SITES= http://www.islc.net/~icszepp/downloads/ MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap +USE_KDELIBS_VER=1 USE_XLIB= yes GNU_CONFIGURE= yes -USE_QT= yes .include <bsd.port.mk> diff --git a/security/kssh/Makefile b/security/kssh/Makefile index 394fdbf6a540..aca56efeb0ac 100644 --- a/security/kssh/Makefile +++ b/security/kssh/Makefile @@ -13,19 +13,11 @@ MASTER_SITES= http://www.geocities.com/bilibao/ MAINTAINER= kevlo@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 GNU_CONFIGURE= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_GMAKE= yes -CONFIGURE_ARGS+=--prefix="${PREFIX}" \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-includes=${LOCALBASE}/include \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" WRKSRC= ${WRKDIR}/${PORTNAME}-0.4 diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 1833fce21603..5e040d99442a 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/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/security/kwallet/distinfo b/security/kwallet/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/security/kwallet/distinfo +++ b/security/kwallet/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 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 diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile index 35d951d5a179..b0bbf2d9f8c5 100644 --- a/vietnamese/kde3-i18n/Makefile +++ b/vietnamese/kde3-i18n/Makefile @@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index 58217d55e780..a2538b801d76 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -21,25 +21,16 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ - --with-extra-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 58217d55e780..a2538b801d76 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -21,25 +21,16 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ - --with-extra-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/kdreamsite/Makefile b/www/kdreamsite/Makefile index 56bf44416610..86d9ea4769f8 100644 --- a/www/kdreamsite/Makefile +++ b/www/kdreamsite/Makefile @@ -12,9 +12,7 @@ MASTER_SITES= http://neptune.spaceports.com/%7Eatnet/files/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11/ - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/kwebsearch/Makefile b/www/kwebsearch/Makefile index c1ac190ec7ac..2fcd0775d414 100644 --- a/www/kwebsearch/Makefile +++ b/www/kwebsearch/Makefile @@ -13,9 +13,8 @@ MASTER_SITES= http://www.guruz.de/ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" diff --git a/www/kwebwatch/Makefile b/www/kwebwatch/Makefile index 168a91a86ce2..9b757ceb7ff7 100644 --- a/www/kwebwatch/Makefile +++ b/www/kwebwatch/Makefile @@ -12,13 +12,8 @@ MASTER_SITES= http://linuxberg.uol.com.br/files/kde/network/ MAINTAINER= lioux@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfile.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_XLIB= yes -USE_QT= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/quanta/Makefile b/www/quanta/Makefile index 58217d55e780..a2538b801d76 100644 --- a/www/quanta/Makefile +++ b/www/quanta/Makefile @@ -21,25 +21,16 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ - --with-extra-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index 911a1ef20521..70a7c34b556c 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -6,26 +6,18 @@ # PORTNAME= kdetoys -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11-clocks 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 +USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo index c2f11fff9b47..ee2d90a95106 100644 --- a/x11-clocks/kdetoys2/distinfo +++ b/x11-clocks/kdetoys2/distinfo @@ -1 +1 @@ -MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627 +MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425 diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 911a1ef20521..70a7c34b556c 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -6,26 +6,18 @@ # PORTNAME= kdetoys -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11-clocks 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 +USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index c2f11fff9b47..ee2d90a95106 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1 +1 @@ -MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627 +MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425 diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 911a1ef20521..70a7c34b556c 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -6,26 +6,18 @@ # PORTNAME= kdetoys -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11-clocks 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 +USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index c2f11fff9b47..ee2d90a95106 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1 +1 @@ -MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627 +MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425 diff --git a/x11-fm/jafm/Makefile b/x11-fm/jafm/Makefile index 0b36650fe046..a2276bfcd822 100644 --- a/x11-fm/jafm/Makefile +++ b/x11-fm/jafm/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= X11/desktop MAINTAINER= brett@peloton.runet.edu -USE_QT= yes +USE_QT_VER= 1 USE_BISON= yes MAKE_ENV= Cxx="${CXX}" CxxFLAGS="${CXXFLAGS}" ALL_TARGET= jafm diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile index 27685a7145f4..fa71a7ba3a86 100644 --- a/x11-toolkits/py-kde/Makefile +++ b/x11-toolkits/py-kde/Makefile @@ -19,7 +19,7 @@ MAINTAINER= adsharma@sharmas.dhs.org BUILD_DEPENDS= ${LOCALBASE}/lib/python1.5/qt.py:${PORTSDIR}/x11-toolkits/py-qt USE_LIBTOOL= yes -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile index c56b33992e6b..97b08cd169fd 100644 --- a/x11-toolkits/py-qt/Makefile +++ b/x11-toolkits/py-qt/Makefile @@ -14,14 +14,12 @@ MAINTAINER= adsharma@sharmas.dhs.org LIB_DEPENDS= sip.4:${PORTSDIR}/devel/sip -USE_QT2= yes +USE_QT_VER= 2 USE_PYTHON= yes USE_LIBTOOL= yes USE_GMAKE= yes CONFIGURE_ENV= LDFLAGS=-lgcc \ SIP_MOC="${X11BASE}/bin/moc2" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib pre-patch: @find ${WRKSRC} -name Makefile.in | \ diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile index 5f5da4ef6344..daa472210046 100644 --- a/x11-wm/bbkeys/Makefile +++ b/x11-wm/bbkeys/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox USE_X_PREFIX= yes GNU_CONFIGURE= yes -USE_QT2=yes +USE_QT_VER= 2 do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile index e89e3c1ebf14..2b4e924809e6 100644 --- a/x11-wm/qlwm/Makefile +++ b/x11-wm/qlwm/Makefile @@ -19,11 +19,10 @@ DOCS= CHANGES README LIBDIR= lib/qlwm PLIST= ${WRKDIR}/pkg-plist MAN1= qlwm.1 -USE_QT2= yes +USE_QT_VER= 2 USE_X_PREFIX= yes -MAKE_ENV= CPPFLAGS="-I${X11BASE}/include/qt2 -I${X11BASE}/include" \ - LFLAGS="-L${X11BASE}/lib -L${X11BASE}/lib/qt2" \ +MAKE_ENV= LFLAGS="-L${X11BASE}/lib -L${X11BASE}/lib/qt2" \ QTDIR=${X11BASE} \ DEST=${PREFIX}/${LIBDIR} diff --git a/x11-wm/toolbox/Makefile b/x11-wm/toolbox/Makefile index a242c1f166c8..cf4d38a3a296 100644 --- a/x11-wm/toolbox/Makefile +++ b/x11-wm/toolbox/Makefile @@ -12,8 +12,7 @@ MASTER_SITES= http://www2.bc.edu/~kelleyry/toolbox/ MAINTAINER= patseal@hyperhost.net -USE_QT2= yes -USE_NEWGCC= yes +USE_QT_VER= 2 USE_X_PREFIX= yes MAKE_ENV= CXX="${CXX}" CC="${CC}" diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile index d873fb6754a4..b580074c6bf6 100644 --- a/x11-wm/wmanager/Makefile +++ b/x11-wm/wmanager/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_X_PREFIX= yes -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes MAKE_ENV= prefix=${PREFIX} diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile index 2f71c9945f56..87dfac8b6560 100644 --- a/x11-wm/xwmm/Makefile +++ b/x11-wm/xwmm/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= asami MAINTAINER= ports@FreeBSD.org USE_X_PREFIX= yes -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes MAKE_ENV= QTDIR=$(X11BASE) ALL_TARGET= # empty diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile index f16a8b59aa38..7796e350a8b0 100644 --- a/x11/kde2/Makefile +++ b/x11/kde2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none @@ -14,15 +14,14 @@ EXTRACT_ONLY= # empty MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \ - kjumpingcube:${PORTSDIR}/games/kdegames2 \ +RUN_DEPENDS= kjumpingcube:${PORTSDIR}/games/kdegames2 \ kdessh:${PORTSDIR}/misc/kdeutils2 \ kword:${PORTSDIR}/editors/koffice \ kppp:${PORTSDIR}/net/kdenetwork2 \ kview:${PORTSDIR}/graphics/kdegraphics2 \ kmidi:${PORTSDIR}/audio/kdemultimedia2 +USE_KDEBASE_VER=2 NO_BUILD= yes do-install: # empty diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index f16a8b59aa38..7796e350a8b0 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none @@ -14,15 +14,14 @@ EXTRACT_ONLY= # empty MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \ - kjumpingcube:${PORTSDIR}/games/kdegames2 \ +RUN_DEPENDS= kjumpingcube:${PORTSDIR}/games/kdegames2 \ kdessh:${PORTSDIR}/misc/kdeutils2 \ kword:${PORTSDIR}/editors/koffice \ kppp:${PORTSDIR}/net/kdenetwork2 \ kview:${PORTSDIR}/graphics/kdegraphics2 \ kmidi:${PORTSDIR}/audio/kdemultimedia2 +USE_KDEBASE_VER=2 NO_BUILD= yes do-install: # empty diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index f16a8b59aa38..7796e350a8b0 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none @@ -14,15 +14,14 @@ EXTRACT_ONLY= # empty MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 -RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \ - kjumpingcube:${PORTSDIR}/games/kdegames2 \ +RUN_DEPENDS= kjumpingcube:${PORTSDIR}/games/kdegames2 \ kdessh:${PORTSDIR}/misc/kdeutils2 \ kword:${PORTSDIR}/editors/koffice \ kppp:${PORTSDIR}/net/kdenetwork2 \ kview:${PORTSDIR}/graphics/kdegraphics2 \ kmidi:${PORTSDIR}/audio/kdemultimedia2 +USE_KDEBASE_VER=2 NO_BUILD= yes do-install: # empty diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index 56031f46e8d9..1b92a29fd446 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes USE_XLIB= yes USE_XPM= yes USE_BZIP2= yes -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-qt-includes=${QTDIR}/include/X11/qt \ @@ -40,12 +40,6 @@ CONFIGURE_ENV= CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \ MAKE_ENV= RM=${RM} CFLAGS+= "-I$(PREFIX)/include" -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif - pre-patch: @${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 243923f1a5d7..51619042121d 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f +MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577 diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile index 05f068b6a855..1679e1341079 100644 --- a/x11/kdelibs11/Makefile +++ b/x11/kdelibs11/Makefile @@ -29,7 +29,7 @@ MAKE_ENV+= SOMAJOR="${LIBVER}" SOMINOR="0" NO_LATEST_LINK= yes USE_BZIP2= yes USE_GMAKE= yes -USE_QT= yes +USE_QT_VER= 1 INSTALLS_SHLIB= yes USE_LIBTOOL= yes LIBTOOLFLAGS= @@ -40,12 +40,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ QTDIR=${QTDIR} -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif - # generate KDE style mtree MTREE_CMD= ${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree MTREE_ARGS= -U -d -e -p diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 170ff7b40d45..405bf219d7b1 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -18,21 +18,17 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ mimelib.3:${PORTSDIR}/converters/kdesupport2 USE_OPENSSL= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_QT_VER= 2 SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes -USE_NEWGCC= 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= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif + USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" @@ -52,6 +48,7 @@ pre-fetch: .endif pre-configure: + ${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index 992af6f45bd7..be16692f3af0 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050 +MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb diff --git a/x11/kdelibs2/files/patch-artsdsp.c b/x11/kdelibs2/files/patch-artsdsp.c deleted file mode 100644 index 380c17a588e5..000000000000 --- a/x11/kdelibs2/files/patch-artsdsp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- arts/artsc/artsdsp.c Sat Oct 28 18:12:12 2000 -+++ arts/artsc/artsdsp.c.new Sat Oct 28 18:14:56 2000 -@@ -27,6 +27,9 @@ - #endif - - #ifdef HAVE_SYS_SOUNDCARD_H -+#ifndef SNDCTL_DSP_CHANNELS -+#define SNDCTL_DSP_CHANNELS SOUND_PCM_WRITE_CHANNELS -+#endif - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> diff --git a/x11/kdelibs2/files/patch-http.cc b/x11/kdelibs2/files/patch-http.cc new file mode 100644 index 000000000000..a06a1d7810fb --- /dev/null +++ b/x11/kdelibs2/files/patch-http.cc @@ -0,0 +1,100 @@ +--- kio/http/http.cc 2001/03/16 05:55:57 1.319.2.7 ++++ kio/http/http.cc 2001/03/30 22:52:10 1.319.2.10 +@@ -48,6 +48,7 @@ + + #include <kapp.h> + #include <klocale.h> ++#include <kcharsets.h> + #include <kprotocolmanager.h> + #include <kdatastream.h> + #include <ksock.h> +@@ -804,6 +805,8 @@ bool HTTPProtocol::http_open() + + // Let's also clear out some things, so bogus values aren't used. + // m_HTTPrev = HTTP_Unknown; ++ m_iWWWAuthCount = 0; ++ m_iProxyAuthCount = 0; + m_sContentMD5 = QString::null; + m_strMimeType = QString::null; + m_qContentEncodings.clear(); +@@ -1184,7 +1187,6 @@ bool HTTPProtocol::readHeader() + + // read in 4096 bytes at a time (HTTP cookies can be quite large.) + int len = 0; +- int proxyAuthCount = 1; + char buffer[4097]; + bool cont = false; + bool cacheValidated = false; // Revalidation was successfull +@@ -1495,9 +1497,6 @@ bool HTTPProtocol::readHeader() + + // check for proxy-based authentication + else if (strncasecmp(buffer, "Proxy-Authenticate:", 19) == 0) { +- if ( proxyAuthCount++ > 1 ) +- configAuth(trimLead(buffer + 19), true, false); +- else + configAuth(trimLead(buffer + 19), true); + } + +@@ -1867,9 +1866,9 @@ void HTTPProtocol::addEncoding(QString e + } + } + +-void HTTPProtocol::configAuth( const char *p, bool b, bool firstCall ) ++void HTTPProtocol::configAuth( const char *p, bool b ) + { +- HTTP_AUTH f; ++ HTTP_AUTH f = AUTH_None; + const char *strAuth = p; + + while( *p == ' ' ) p++; +@@ -1894,15 +1893,33 @@ void HTTPProtocol::configAuth( const cha + { + kdWarning(7103) << "Unsupported or invalid authorization type requested" << endl; + kdWarning(7103) << "Request Authorization: " << p << endl; +- if ( firstCall && b ) +- ProxyAuthentication = AUTH_None; +- return; + } + +- // Always prefer the stronger authentication mode: +- // AUTH_NONE < AUTH_BASIC < AUTH_DIGEST... +- if ( (b && f < ProxyAuthentication) || (!b && f < Authentication) ) ++ /* ++ This check ensures the following: ++ 1.) Rejection of any unknown/unsupported authentication schemes ++ 2.) Useage of the strongest possible authentication schemes if ++ and when multiple Proxy-Authenticate or WWW-Authenticate ++ header field is sent. ++ */ ++ if ( f == AUTH_None || ++ (b && m_iProxyAuthCount > 0 && f < ProxyAuthentication) || ++ (!b && m_iWWWAuthCount > 0 && f < Authentication) ) ++ { ++ // Since I purposefully made the Proxy-Authentication settings ++ // persistent to reduce the number of round-trips to kdesud we ++ // have to take special care when an unknown/unsupported auth- ++ // scheme is received. This check accomplishes just that... ++ if ( b ) ++ { ++ if ( !m_iProxyAuthCount ) ++ ProxyAuthentication = f; ++ m_iProxyAuthCount++; ++ } ++ else ++ m_iWWWAuthCount++; + return; ++ } + + while (*p) + { +@@ -3235,7 +3252,9 @@ void HTTPProtocol::reparseConfiguration( + // Use commas not spaces. + m_strLanguages = languageList.join( ", " ); + kdDebug(7103) << "Languages list set to " << m_strLanguages << endl; +- m_strCharsets = KGlobal::locale()->charset() + QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8"); ++ // Ugly conversion. kdeglobals has the xName (e.g. iso8859-1 instead of iso-8859-1) ++ m_strCharsets = KGlobal::charsets()->name(KGlobal::charsets()->xNameToID(KGlobal::locale()->charset())); ++ m_strCharsets += QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8"); + + // Launch the cookiejar if not already running + KConfig *cookieConfig = new KConfig("kcookiejarrc", false, false); diff --git a/x11/kdelibs2/files/patch-http.h b/x11/kdelibs2/files/patch-http.h new file mode 100644 index 000000000000..dbd420b0391b --- /dev/null +++ b/x11/kdelibs2/files/patch-http.h @@ -0,0 +1,26 @@ +--- kio/http/http.h 2001/02/26 03:57:23 1.83.2.1 ++++ kio/http/http.h 2001/03/29 23:43:13 1.83.2.2 +@@ -1,4 +1,4 @@ +-// $Id: http.h,v 1.83.2.1 2001/02/26 03:57:23 waba Exp $ ++// $Id: http.h,v 1.83.2.2 2001/03/29 23:43:13 adawit Exp $ + + #ifndef __http_h__ + #define __http_h__ +@@ -178,7 +178,7 @@ protected: + */ + void addEncoding(QString, QStringList &); + +- void configAuth(const char *, bool, bool firstCall = true ); ++ void configAuth(const char *, bool); + #ifdef DO_SSL + void initSSL(); + void closeSSL(); +@@ -362,6 +362,8 @@ protected: + HTTP_AUTH Authentication; + HTTP_AUTH ProxyAuthentication; + bool m_bUnauthorized; ++ short unsigned int m_iProxyAuthCount; ++ short unsigned int m_iWWWAuthCount; + + // Persistant connections + bool m_bKeepAlive; diff --git a/x11/kdelibs2/files/patch-kapp.cpp b/x11/kdelibs2/files/patch-kapp.cpp deleted file mode 100644 index 51d25c2ae580..000000000000 --- a/x11/kdelibs2/files/patch-kapp.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kdecore/kapp.cpp Sun Feb 18 10:26:53 2001 -+++ kdecore/kapp.cpp.new Thu Feb 22 23:58:03 2001 -@@ -795,6 +795,7 @@ - // we already have a connection to the session manager, use it. - SmcRequestSaveYourself( mySmcConnection, SmSaveBoth, True, - SmInteractStyleAny, False, True ); -+ SmcCloseConnection( mySmcConnection, 0, 0 ); - - // flush the request - IceFlush(SmcGetIceConnection(mySmcConnection)); diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 170ff7b40d45..405bf219d7b1 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -18,21 +18,17 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ mimelib.3:${PORTSDIR}/converters/kdesupport2 USE_OPENSSL= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_QT_VER= 2 SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes -USE_NEWGCC= 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= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif + USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" @@ -52,6 +48,7 @@ pre-fetch: .endif pre-configure: + ${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 992af6f45bd7..be16692f3af0 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050 +MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 170ff7b40d45..405bf219d7b1 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -18,21 +18,17 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ mimelib.3:${PORTSDIR}/converters/kdesupport2 USE_OPENSSL= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_QT_VER= 2 SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes -USE_NEWGCC= 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= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif + USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" @@ -52,6 +48,7 @@ pre-fetch: .endif pre-configure: + ${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ "s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \ s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g") diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 992af6f45bd7..be16692f3af0 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050 +MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb diff --git a/x11/kvidtune/Makefile b/x11/kvidtune/Makefile index 33be5f7a7059..610e4d31c44f 100644 --- a/x11/kvidtune/Makefile +++ b/x11/kvidtune/Makefile @@ -13,12 +13,7 @@ MASTER_SITE_SUBDIR= unstable/apps/admin MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 \ - kfile.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index d909d80e60dd..86b7eb4c0af6 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -14,11 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= scrappy@freebsd.org -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 \ - kfm.3:${PORTSDIR}/x11/kdelibs11 - -USE_QT= yes +USE_KDELIBS_VER=1 GNU_CONFIGURE= yes .include <bsd.port.mk> |