Date: Fri, 3 Aug 2007 21:24:34 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 124612 for review Message-ID: <200708032124.l73LOY5c078375@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=124612 Change 124612 by gabor@gabor_server on 2007/08/03 21:23:37 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/MOVED#16 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.qt.mk#3 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/MOVED#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1436 2007/07/28 16:41:27 chinsan Exp $ +# $FreeBSD: ports/MOVED,v 1.1442 2007/08/03 07:24:48 clsung Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3112,3 +3112,30 @@ games/freeciv-gtk|games/freeciv|2007-07-28|Dropped gtk1 support games/freeciv-gtk2|games/freeciv|2007-07-28|Gtk2 is supported by default now math/cvcl||2007-07-28|Has expired: CVC Lite is no longer supported. Please use CVC3 (math/cvc3) for all your validity checking needs! +www/p5-Kwiki-Archive-Rcs||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Archive-SVK||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Atom||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Cache||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Diff||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Edit-RequireUserName||2007-08-01|Has expired: Already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-GDGraphGenerator||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Infobox||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-ModPerl||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-NavigationToolbar||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-NewPage||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Notify-Mail||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-PagePrivacy||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-RecentChanges||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-RecentChangesRSS||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Revisions||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Search||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Theme-ColumnLayout||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-UserName||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-UserPreferences||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-VimMode||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-plugins||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +www/p5-Kwiki-Icons-Gnome||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later) +x11-fm/endeavour||2007-08-01|Has expired: Development ceased, this port should be updated to Endeavour Mark II +security/p5-openxpki-client-soap-lite||2007-08-01|Has expired: No longer maintained by Developers. +net-mgmt/aircrack|net-mgmt/aircrack-ng|2007-08-01|Has expired: Please use net-mgmt/aircrack-ng +databases/ruby-postgres|databases/rubygem-postgres|2007-08-03|Port updated in rubygem version ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.18 2007/07/18 21:56:10 edwin Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.19 2007/08/02 05:42:21 delphij Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -196,7 +196,7 @@ .if defined(USE_BDB) -_DB_PORTS= 2 3 40 41 42 43 44 3+ 40+ 41+ 42+ 43+ 44+ +_DB_PORTS= 2 3 40 41 42 43 44 45 3+ 40+ 41+ 42+ 43+ 44+ 45+ # Dependence lines for different db versions db2_DEPENDS= db2.0:${PORTSDIR}/databases/db2 db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3 @@ -205,6 +205,7 @@ db42_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42 db43_DEPENDS= db-4.3.0:${PORTSDIR}/databases/db43 db44_DEPENDS= db-4.4.0:${PORTSDIR}/databases/db44 +db45_DEPENDS= db-4.5.0:${PORTSDIR}/databases/db45 # Detect db versions by finding some files db3_FIND= ${LOCALBASE}/include/db3/db.h db40_FIND= ${LOCALBASE}/include/db4/db.h @@ -212,13 +213,16 @@ db42_FIND= ${LOCALBASE}/include/db42/db.h db43_FIND= ${LOCALBASE}/include/db43/db.h db44_FIND= ${LOCALBASE}/include/db44/db.h +db45_FIND= ${LOCALBASE}/include/db45/db.h # For specifying [3, 40, 41, ..]+ -_DB_3P= 3 40 41 42 43 44 -_DB_40P= 40 41 42 43 44 -_DB_41P= 41 42 43 44 -_DB_42P= 42 43 44 -_DB_43P= 43 44 +_DB_3P= 3 ${_DB_40P} +_DB_40P= 40 ${_DB_41P} +_DB_41P= 41 ${_DB_42P} +_DB_42P= 42 ${_DB_43P} +_DB_43P= 43 ${_DB_44P} +_DB_44P= 44 ${_DB_45P} +_DB_45P= 45 # Override the global WITH_BDB_VER with the # port specific <UNIQUENAME>_WITH_BDB_VER @@ -342,6 +346,10 @@ BDB_LIB_NAME= db-4.4 BDB_LIB_CXX_NAME= db_cxx-4.4 BDB_LIB_DIR= ${LOCALBASE}/lib/db44 +. elif ${_BDB_VER} == 45 +BDB_LIB_NAME= db-4.5 +BDB_LIB_CXX_NAME= db_cxx-4.5 +BDB_LIB_DIR= ${LOCALBASE}/lib/db45 . endif BDB_LIB_NAME?= db${_BDB_VER} BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.qt.mk#3 (text+ko) ==== @@ -34,7 +34,14 @@ CONFIGURE_ARGS+=-no-3dnow -no-sse -no-sse2 .endif #defined(PACKAGE_BUILDING) -.if defined(QT_WANT_VERBOSE_CONFIGURE) +.if !defined(WANT_QT_DEBUG) +CONFIGURE_ARGS+=-no-separate-debug-info +PLIST_SUB+= DEBUG="@comment " +.else +PLIST_SUB+= DEBUG="" +.endif + +.if defined(WANT_QT_VERBOSE_CONFIGURE) CONFIGURE_ARGS+=-v .endif .endif #defined(QT_DIST) @@ -44,6 +51,11 @@ UIC?= ${QT_PREFIX}/bin/uic-qt4 QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ +QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ + QMAKE_LINK="${CXX}" QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \ + QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}" .if ${OSVERSION} < 700042 && ${ARCH} == "amd64" QTCPPFLAGS?= -fno-gcse @@ -101,24 +113,111 @@ uic3_DEPENDS= devel/qt4-uic3 xml_DEPENDS= textproc/qt4-xml +accessible_build_DEPENDS= ${accessible_DEPENDS} +assistant_build_DEPENDS= ${assistant_DEPENDS} +assistantclient_build_DEPENDS= ${assistantclient_DEPENDS} +assistantclient_build_NAME= ${assistantclient_NAME} +codecs-cn_build_DEPENDS= ${codecs-cn_DEPENDS} +codecs-jp_build_DEPENDS= ${codecs-jp_DEPENDS} +codecs-kr_build_DEPENDS= ${codecs-kr_DEPENDS} +codecs-tw_build_DEPENDS= ${codecs-tw_DEPENDS} +corelib_build_DEPENDS= ${corelib_DEPENDS} +dbus_build_DEPENDS= ${dbus_DEPENDS} +designer_build_DEPENDS= ${designer_DEPENDS} +doc_build_DEPENDS= ${doc_DEPENDS} +gui_build_DEPENDS= ${gui_DEPENDS} +iconengines_build_DEPENDS= ${iconengines_DEPENDS} +imageformats_build_DEPENDS= ${imageformats_DEPENDS} +inputmethods_build_DEPENDS= ${inputmethods_DEPENDS} +linguist_build_DEPENDS= ${linguist_DEPENDS} +makeqpf_build_DEPENDS= ${makeqpf_DEPENDS} +moc_build_DEPENDS= ${moc_DEPENDS} +network_build_DEPENDS= ${network_DEPENDS} +opengl_build_DEPENDS= ${opengl_DEPENDS} +pixeltool_build_DEPENDS= ${pixeltool_DEPENDS} +porting_build_DEPENDS= ${porting_DEPENDS} +qdbusviewer_build_DEPENDS= ${qdbusviewer_DEPENDS} +qmake_build_DEPENDS= ${qmake_DEPENDS} +qmake_build_QT4_PREFIX= ${qmake_QT4_PREFIX} +qt3support_build_DEPENDS= ${qt3support_DEPENDS} +qtconfig_build_DEPENDS= ${qtconfig_DEPENDS} +qtestlib_build_DEPENDS= ${qtestlib_DEPENDS} +qvfb_build_DEPENDS= ${qvfb_DEPENDS} +rcc_build_DEPENDS= ${rcc_DEPENDS} +script_build_DEPENDS= ${script_DEPENDS} +sql_build_DEPENDS= ${sql_DEPENDS} +svg_build_DEPENDS= ${svg_DEPENDS} +uic_build_DEPENDS= ${uic_DEPENDS} +uic3_build_DEPENDS= ${uic3_DEPENDS} +xml_build_DEPENDS= ${xml_DEPENDS} + +accessible_run_DEPENDS= ${accessible_DEPENDS} +assistant_run_DEPENDS= ${assistant_DEPENDS} +assistantclient_run_DEPENDS= ${assistantclient_DEPENDS} +assistantclient_run_NAME= ${assistantclient_NAME} +codecs-cn_run_DEPENDS= ${codecs-cn_DEPENDS} +codecs-jp_run_DEPENDS= ${codecs-jp_DEPENDS} +codecs-kr_run_DEPENDS= ${codecs-kr_DEPENDS} +codecs-tw_run_DEPENDS= ${codecs-tw_DEPENDS} +corelib_run_DEPENDS= ${corelib_DEPENDS} +dbus_run_DEPENDS= ${dbus_DEPENDS} +designer_run_DEPENDS= ${designer_DEPENDS} +doc_run_DEPENDS= ${doc_DEPENDS} +gui_run_DEPENDS= ${gui_DEPENDS} +iconengines_run_DEPENDS= ${iconengines_DEPENDS} +imageformats_run_DEPENDS= ${imageformats_DEPENDS} +inputmethods_run_DEPENDS= ${inputmethods_DEPENDS} +linguist_run_DEPENDS= ${linguist_DEPENDS} +makeqpf_run_DEPENDS= ${makeqpf_DEPENDS} +moc_run_DEPENDS= ${moc_DEPENDS} +network_run_DEPENDS= ${network_DEPENDS} +opengl_run_DEPENDS= ${opengl_DEPENDS} +pixeltool_run_DEPENDS= ${pixeltool_DEPENDS} +porting_run_DEPENDS= ${porting_DEPENDS} +qdbusviewer_run_DEPENDS= ${qdbusviewer_DEPENDS} +qmake_run_DEPENDS= ${qmake_DEPENDS} +qmake_run_QT4_PREFIX= ${qmake_QT4_PREFIX} +qt3support_run_DEPENDS= ${qt3support_DEPENDS} +qtconfig_run_DEPENDS= ${qtconfig_DEPENDS} +qtestlib_run_DEPENDS= ${qtestlib_DEPENDS} +qvfb_run_DEPENDS= ${qvfb_DEPENDS} +rcc_run_DEPENDS= ${rcc_DEPENDS} +script_run_DEPENDS= ${script_DEPENDS} +sql_run_DEPENDS= ${sql_DEPENDS} +svg_run_DEPENDS= ${svg_DEPENDS} +uic_run_DEPENDS= ${uic_DEPENDS} +uic3_run_DEPENDS= ${uic3_DEPENDS} +xml_run_DEPENDS= ${xml_DEPENDS} + .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Qt_Post_Include= bsd.qt.mk +.for component in ${_QT_COMPONENTS_ALL} +_QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run +.endfor + .if defined(QT_COMPONENTS) .for ext in ${QT_COMPONENTS} -${ext}_QT4_PREFIX?= qt4- -${ext}_QT4_VERSION?= ${QT4_VERSION} -${ext}_NAME?= ${ext} -.if ${_QT_COMPONENTS_ALL:M${ext}}!= "" -BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} -RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +${ext}_QT4_PREFIX?= qt4- +${ext}_QT4_VERSION?= ${QT4_VERSION} +${ext}_NAME?= ${ext} +_${ext}= ${ext} +.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= "" +.if ${_${ext}:M*_build}!= "" +BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +.elif ${_${ext}:M*_run}!= "" +RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +.else +BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +.endif .else IGNORE= cannot install: unknown Qt4 component -- ${ext} .endif .endfor .else -BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4 -RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4 +BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4 +RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4 .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708032124.l73LOY5c078375>