diff options
32 files changed, 92 insertions, 378 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index c3f6ccf53..f5dab457f 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.208 2011/04/30 20:43:13 mezz Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.209 2011/06/04 22:51:27 mezz Exp $ # PORTNAME= evolution-data-server @@ -41,8 +41,8 @@ CONFIGURE_ARGS= --enable-static \ --enable-gnome-keyring=yes \ --with-openldap=yes \ --with-libdb=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2" diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile index 7c190c915..c8ff17d37 100644 --- a/databases/evolution-data-server3/Makefile +++ b/databases/evolution-data-server3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.14 2011/05/24 11:21:08 kwm Exp $ +# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.15 2011/06/04 22:51:27 mezz Exp $ # PORTNAME= evolution-data-server @@ -42,8 +42,8 @@ CONFIGURE_ARGS= --enable-static \ --enable-gtk3 \ --with-openldap=yes \ --with-libdb=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_SUB= VERSION="3.0" EVO_VERSION="1.2" diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index d4ff82303..0c77e358e 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda4/Makefile,v 1.18 2011/05/14 08:17:22 kwm Exp $ +# $MCom: ports/databases/libgda4/Makefile,v 1.19 2011/06/02 15:43:38 kwm Exp $ # PORTNAME= libgda4 @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org COMMENT?= Provides uniform access to different kinds of data sources -CONFLICTS= libgda5-ui-* +CONFLICTS= libgda5-ui-[0-9]* USE_XZ= yes LIBGDA4_SLAVE?= no @@ -42,23 +42,22 @@ MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS= --without-oracle \ --disable-crypto \ --enable-introspection=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" .if ${LIBGDA4_SLAVE}=="no" OPTIONS= UI "Build UI tools" on .endif -.if defined(WITH_UI) -INSTALLS_ICONS= yes -.endif - .include <bsd.port.options.mk> -#VERSION= ${PORTVERSION:R} VERSION= 4.0 PLIST_SUB= VERSION=${VERSION} +.if defined(WITH_UI) +INSTALLS_ICONS= yes +.endif + .if ${LIBGDA4_SLAVE}=="no" .if defined(WITH_UI) CONFIGURE_ARGS+=--with-ui @@ -103,13 +102,6 @@ CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} CONFIGURE_ARGS+= --without-postgres .endif -.if ${LIBGDA4_SLAVE}=="firebird" -LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client -CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-firebird -.endif - # MDB (MS Access) .if ${LIBGDA4_SLAVE}=="mdb" LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile index f10bd9b38..9d230ac05 100644 --- a/databases/libgda5-ui/Makefile +++ b/databases/libgda5-ui/Makefile @@ -3,21 +3,21 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $ +# $MCom: ports/databases/libgda5-ui/Makefile,v 1.1 2011/03/30 19:23:04 kwm Exp $ # PORTREVISION?= 0 CATEGORIES= databases gnome PKGNAMESUFFIX?= -ui -CONFLICTS= libgda4-4.* - MAINTAINER= gnome@FreeBSD.org -COMMENT= libgda 5 ui library +COMMENT= The libgda 5 ui library MASTERDIR= ${.CURDIR}/../libgda5 PLIST= ${.CURDIR}/pkg-plist +CONFLICTS= libgda4-4.* + LIBGDA5_SLAVE= ui do-build: diff --git a/databases/libgda5-ui/pkg-plist.bak b/databases/libgda5-ui/pkg-plist.bak deleted file mode 100644 index 3e866a6bd..000000000 --- a/databases/libgda5-ui/pkg-plist.bak +++ /dev/null @@ -1,263 +0,0 @@ -bin/gda-browser-%%VERSION%% -bin/gda-control-center-%%VERSION%% -bin/gdaui-demo-%%VERSION%% -include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-rt-editor.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h -include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h -include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h -lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml -lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml -lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml -lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml -lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml -lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a -lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la -lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so -lib/libgda-ui-%%VERSION%%.a -lib/libgda-ui-%%VERSION%%.la -lib/libgda-ui-%%VERSION%%.so -lib/libgda-ui-%%VERSION%%.so.5 -libdata/pkgconfig/libgda-ui-%%VERSION%%.pc -share/applications/gda-browser-%%VERSION%%.desktop -share/applications/gda-control-center-%%VERSION%%.desktop -share/gnome/help/gda-browser-%%VERSION%%/C/actions.page -share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-source-editor.page -share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-xml-syntax.page -share/gnome/help/gda-browser-%%VERSION%%/C/declaredfk.page -share/gnome/help/gda-browser-%%VERSION%%/C/diagram.page -share/gnome/help/gda-browser-%%VERSION%%/C/features.page -share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-1.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-2.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-3.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-4.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/cnc_open.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-mode.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-persp.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-uicompose.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-xmlcompose.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/declaredfk-dialog.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/declaredfk.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/diagram.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/mainwin.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/query-exec-persp.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/schema-browser-persp.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/table-insert-data.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-begin.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-commit.png -share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-rollback.png -share/gnome/help/gda-browser-%%VERSION%%/C/general-ui.page -share/gnome/help/gda-browser-%%VERSION%%/C/index.page -share/gnome/help/gda-browser-%%VERSION%%/C/legal.xml -share/gnome/help/gda-browser-%%VERSION%%/C/query-execution-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/C/schema-browser-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/C/table-insert-data.page -share/gnome/help/gda-browser-%%VERSION%%/C/transactions.page -share/gnome/help/gda-browser-%%VERSION%%/C/variables.page -share/gnome/help/gda-browser-%%VERSION%%/de/actions.page -share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-source-editor.page -share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-xml-syntax.page -share/gnome/help/gda-browser-%%VERSION%%/de/declaredfk.page -share/gnome/help/gda-browser-%%VERSION%%/de/diagram.page -share/gnome/help/gda-browser-%%VERSION%%/de/features.page -share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-1.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-2.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-3.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-4.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/cnc_open.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-mode.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-persp.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-uicompose.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-xmlcompose.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/declaredfk-dialog.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/declaredfk.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/diagram.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/mainwin.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/query-exec-persp.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/schema-browser-persp.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/table-insert-data.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-begin.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-commit.png -share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-rollback.png -share/gnome/help/gda-browser-%%VERSION%%/de/general-ui.page -share/gnome/help/gda-browser-%%VERSION%%/de/index.page -share/gnome/help/gda-browser-%%VERSION%%/de/legal.xml -share/gnome/help/gda-browser-%%VERSION%%/de/query-execution-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/de/schema-browser-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/de/table-insert-data.page -share/gnome/help/gda-browser-%%VERSION%%/de/transactions.page -share/gnome/help/gda-browser-%%VERSION%%/de/variables.page -share/gnome/help/gda-browser-%%VERSION%%/es/actions.page -share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-source-editor.page -share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-xml-syntax.page -share/gnome/help/gda-browser-%%VERSION%%/es/declaredfk.page -share/gnome/help/gda-browser-%%VERSION%%/es/diagram.page -share/gnome/help/gda-browser-%%VERSION%%/es/features.page -share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-1.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-2.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-3.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-4.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/cnc_open.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-mode.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-persp.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-uicompose.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-xmlcompose.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/declaredfk-dialog.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/declaredfk.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/diagram.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/mainwin.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/query-exec-persp.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/schema-browser-persp.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/table-insert-data.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-begin.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-commit.png -share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-rollback.png -share/gnome/help/gda-browser-%%VERSION%%/es/general-ui.page -share/gnome/help/gda-browser-%%VERSION%%/es/index.page -share/gnome/help/gda-browser-%%VERSION%%/es/legal.xml -share/gnome/help/gda-browser-%%VERSION%%/es/query-execution-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/es/schema-browser-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/es/table-insert-data.page -share/gnome/help/gda-browser-%%VERSION%%/es/transactions.page -share/gnome/help/gda-browser-%%VERSION%%/es/variables.page -share/gnome/help/gda-browser-%%VERSION%%/sl/actions.page -share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-source-editor.page -share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-xml-syntax.page -share/gnome/help/gda-browser-%%VERSION%%/sl/declaredfk.page -share/gnome/help/gda-browser-%%VERSION%%/sl/diagram.page -share/gnome/help/gda-browser-%%VERSION%%/sl/features.page -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-1.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-2.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-3.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-4.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/cnc_open.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-mode.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-persp.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-uicompose.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-xmlcompose.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/declaredfk-dialog.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/declaredfk.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/diagram.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/mainwin.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/query-exec-persp.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/schema-browser-persp.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/table-insert-data.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-begin.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-commit.png -share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-rollback.png -share/gnome/help/gda-browser-%%VERSION%%/sl/general-ui.page -share/gnome/help/gda-browser-%%VERSION%%/sl/index.page -share/gnome/help/gda-browser-%%VERSION%%/sl/legal.xml -share/gnome/help/gda-browser-%%VERSION%%/sl/query-execution-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/sl/schema-browser-perspective.page -share/gnome/help/gda-browser-%%VERSION%%/sl/table-insert-data.page -share/gnome/help/gda-browser-%%VERSION%%/sl/transactions.page -share/gnome/help/gda-browser-%%VERSION%%/sl/variables.page -share/icons/hicolor/16x16/apps/gda-control-center.png -share/icons/hicolor/22x22/apps/gda-control-center.png -share/icons/hicolor/24x24/apps/gda-control-center.png -share/icons/hicolor/256x256/apps/gda-control-center.png -share/icons/hicolor/32x32/apps/gda-control-center.png -share/icons/hicolor/48x48/apps/gda-control-center.png -share/libgda-%%VERSION%%/demo/basic_form.c -share/libgda-%%VERSION%%/demo/cloud.c -share/libgda-%%VERSION%%/demo/combo.c -share/libgda-%%VERSION%%/demo/custom_layout.xml -share/libgda-%%VERSION%%/demo/data_model_dir.c -share/libgda-%%VERSION%%/demo/ddl_queries.c -share/libgda-%%VERSION%%/demo/demo_db.db -share/libgda-%%VERSION%%/demo/form.c -share/libgda-%%VERSION%%/demo/form_data_layout.c -share/libgda-%%VERSION%%/demo/form_pict.c -share/libgda-%%VERSION%%/demo/form_rw.c -share/libgda-%%VERSION%%/demo/grid.c -share/libgda-%%VERSION%%/demo/grid_data_layout.c -share/libgda-%%VERSION%%/demo/grid_pict.c -share/libgda-%%VERSION%%/demo/grid_rw.c -share/libgda-%%VERSION%%/demo/linked_grid_form.c -share/libgda-%%VERSION%%/demo/linked_model_param.c -share/libgda-%%VERSION%%/demo/login.c -share/libgda-%%VERSION%%/demo/provider_sel.c -share/libgda-%%VERSION%%/demo/tree.c -share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd -share/libgda-%%VERSION%%/import_encodings.xml -share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png -share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png -share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png -share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png -share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png -share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png -share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png -share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png -share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png -share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png -share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache -share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg -share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg -share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg -share/libgda-%%VERSION%%/language-specs/gda-sql.lang -share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-action.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png -share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png -share/libgda-%%VERSION%%/pixmaps/gda-browser.png -share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png -share/libgda-%%VERSION%%/pixmaps/gda-control-center.png -share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png -share/libgda-%%VERSION%%/server_operation.glade -share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml -share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml -share/pixmaps/gda-browser-%%VERSION%%.png -@dirrm share/libgda-%%VERSION%%/ui -@dirrm share/libgda-%%VERSION%%/pixmaps -@dirrm share/libgda-%%VERSION%%/language-specs -@dirrm share/libgda-%%VERSION%%/demo -@dirrm lib/libgda-%%VERSION%%/plugins -@dirrm include/libgda-%%VERSION%%/libgda-ui diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index ac45a9b43..b90f5b64b 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda5/Makefile,v 1.2 2011/06/02 13:29:13 kwm Exp $ +# $MCom: ports/databases/libgda5/Makefile,v 1.3 2011/06/02 15:39:39 kwm Exp $ # PORTNAME= libgda5 @@ -45,7 +45,6 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.options.mk> -#VERSION= ${PORTVERSION:R} VERSION= 5.0 PLIST_SUB= VERSION=${VERSION} @@ -58,11 +57,11 @@ USE_GNOME+= libgda5 .if ${LIBGDA5_SLAVE}=="ui" CONFIGURE_ARGS+=--with-ui USE_GNOME+= gtk30 gnomedocutils +INSTALLS_ICONS= yes .else CONFIGURE_ARGS+=--without-ui .endif - .if ${LIBGDA5_SLAVE}=="bdb" USE_BDB= yes CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} @@ -91,13 +90,6 @@ CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} CONFIGURE_ARGS+= --without-postgres .endif -.if ${LIBGDA5_SLAVE}=="firebird" -LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client -CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-firebird -.endif - # MDB (MS Access) .if ${LIBGDA5_SLAVE}=="mdb" LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile index 2e9d6acf5..4075b9d55 100644 --- a/deskutils/gnome-tweak-tool/Makefile +++ b/deskutils/gnome-tweak-tool/Makefile @@ -20,8 +20,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gconf2 pygobject USE_PYTHON= yes +USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 7f3ef76cf..9a44d1340 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.153 2011/04/10 19:41:35 mezz Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.154 2011/04/17 19:09:42 mezz Exp $ # PORTNAME= gnome-utils @@ -30,8 +30,8 @@ INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --enable-maintainer-flags=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \ gnome-system-log.1 baobab.1 diff --git a/deskutils/gnome-utils3/Makefile b/deskutils/gnome-utils3/Makefile index 68e1a1ddc..7a80df523 100644 --- a/deskutils/gnome-utils3/Makefile +++ b/deskutils/gnome-utils3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.9 2011/04/27 10:57:14 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.10 2011/06/10 22:59:02 mezz Exp $ # PORTNAME= gnome-utils @@ -33,8 +33,8 @@ USE_XORG= xext x11 USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel3 ltverhack gconf2 USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --enable-maintainer-flags=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \ gnome-system-log.1 baobab.1 diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index cff03d14f..3ac3c82f4 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.77 2011/04/17 19:14:30 mezz Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.78 2011/04/30 20:43:14 mezz Exp $ # PORTNAME= gucharmap @@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gucharmap.schemas diff --git a/deskutils/gucharmap3/Makefile b/deskutils/gucharmap3/Makefile index df12fe617..56a6d89bb 100644 --- a/deskutils/gucharmap3/Makefile +++ b/deskutils/gucharmap3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap3/Makefile,v 1.4 2011/04/27 10:33:56 kwm Exp $ +# $MCom: ports/deskutils/gucharmap3/Makefile,v 1.5 2011/06/10 22:59:02 mezz Exp $ # PORTNAME= gucharmap @@ -25,8 +25,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gtk30 gnomedocutils gconf2 GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-gtk=3.0 GCONF_SCHEMAS= gucharmap.schemas diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index 5b84970a4..61b1c80a9 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -3,7 +3,7 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ -# $MCom: ports/deskutils/notification-daemon/Makefile,v 1.9 2011/01/24 23:18:36 kwm Exp $ +# $MCom: ports/deskutils/notification-daemon/Makefile,v 1.10 2011/03/16 04:09:23 mezz Exp $ # PORTNAME= notification-daemon @@ -27,10 +27,8 @@ USE_XORG= x11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -#GCONF_SCHEMAS= notification-daemon.schemas +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]* diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index bbccb60ce..97cc7e0c7 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -24,8 +24,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_SUB= VERSION="1.0" diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 3bbf8b3c9..566ea8897 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -49,6 +49,6 @@ libexec/dbus-daemon-launch-helper @dirrm etc/dbus-1 @unexec rm -f /var/run/dbus/dbus.pid @unexec rm -f /var/run/dbus/dbus.pipe -@unexec rmdir /var/run/dbus 2>/dev/null || true +@dirrmtry /var/run/dbus @unexec rm -f /var/db/dbus/machine-id -@unexec rmdir /var/db/dbus 2>/dev/null || true +@dirrmtry /var/db/dbus diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index de5165d19..9b5883c97 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/dconf/Makefile,v 1.21 2011/03/23 13:56:00 kwm Exp $ +# $MCom: ports/devel/dconf/Makefile,v 1.22 2011/05/09 17:53:48 kwm Exp $ # PORTNAME= dconf @@ -25,8 +25,8 @@ USE_GNOME= gnomehack gtk20 gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml post-patch: diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 7ce2e2cb8..cd60c1ae8 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/devhelp/Makefile,v 1.41 2011/04/17 19:18:07 mezz Exp $ +# $MCom: ports/devel/devhelp/Makefile,v 1.42 2011/04/30 20:43:15 mezz Exp $ PORTNAME= devhelp PORTVERSION= 2.32.0 @@ -31,10 +31,10 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GCONF_SCHEMAS= devhelp.schemas -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CPPFLAGS= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" -OPTIONS= GEDIT "Enable GEdit plug-in support" off +OPTIONS= GEDIT "Enable GEdit plug-in support" off .include <bsd.port.pre.mk> diff --git a/devel/devhelp3/Makefile b/devel/devhelp3/Makefile index 673f1b744..080993567 100644 --- a/devel/devhelp3/Makefile +++ b/devel/devhelp3/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/devhelp3/Makefile,v 1.7 2011/04/17 19:18:07 mezz Exp $ +# $MCom: ports/devel/devhelp3/Makefile,v 1.8 2011/06/10 22:59:02 mezz Exp $ PORTNAME= devhelp PORTVERSION= 3.0.0 @@ -24,14 +24,13 @@ USE_XORG= x11 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk30 gconf2 -# libwnck3 USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GCONF_SCHEMAS= devhelp.schemas -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CPPFLAGS= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" #OPTIONS= GEDIT "Enable GEdit plug-in support" off diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 8f1cb0137..dba0287b7 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.126 2011/04/05 09:19:12 kwm Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.127 2011/04/25 12:19:03 kwm Exp $ # PORTNAME= gconf2 @@ -36,10 +36,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" MAN1= gconftool-2.1 gsettings-data-convert.1 \ gsettings-schema-convert.1 diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index fe77b17bf..01efa39a5 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.80 2011/05/21 18:28:13 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.81 2011/06/06 13:37:23 kwm Exp $ # PORTNAME= gio-fam-backend @@ -21,7 +21,7 @@ DISTNAME= glib-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= FAM backend for GLib's GIO library +COMMENT= FAM backend for GLib\'s GIO library USE_XZ= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam @@ -32,8 +32,8 @@ USE_FAM= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 9c1020f3c..45a1977fb 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glade3/Makefile,v 1.44 2010/06/06 22:11:46 kwm Exp $ +# $MCom: ports/devel/glade/Makefile,v 1.1 2011/04/06 12:05:30 kwm Exp $ # PORTNAME= glade @@ -16,10 +16,10 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= A user interface builder for GTK+ 3 -CONFLICTS= glade3-3.* - BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +CONFLICTS= glade3-3.* + INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index 1aa56ddaf..84dc34539 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -506,4 +506,3 @@ share/omf/glade/glade-sl.omf share/omf/glade/glade-sv.omf share/omf/glade/glade-uk.omf share/omf/glade/glade-zh_CN.omf - diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index 54aa524c0..4817f4b4a 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glade3/Makefile,v 1.46 2011/04/06 12:02:56 kwm Exp $ +# $MCom: ports/devel/glade3/Makefile,v 1.47 2011/06/10 22:59:03 mezz Exp $ # PORTNAME= glade3 @@ -28,8 +28,8 @@ USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS= ${CPPFLAGS} -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" DOCSDIR= ${PREFIX}/share/doc/gladeui diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index cfd02a6eb..58758995b 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.207 2011/05/21 18:28:13 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.208 2011/06/06 13:37:22 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! @@ -47,8 +47,8 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --disable-dtrace \ --with-pcre=system \ --disable-fam -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 04e35f1e1..3aa966493 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.37 2011/04/05 16:20:15 kwm Exp $ +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.38 2011/04/21 16:00:10 kwm Exp $ # PORTNAME= gobject-introspection @@ -28,9 +28,8 @@ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-tests # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 @@ -45,4 +44,3 @@ post-patch: ${WRKSRC}/giscanner/sourcescanner.py .include <bsd.port.post.mk> - diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 5fb49e129..c36a26f99 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.74 2011/05/24 19:46:39 kwm Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.75 2011/06/04 22:51:27 mezz Exp $ # PORTNAME= gvfs @@ -25,8 +25,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-obexftp OPTIONS= FUSE "Enable fuse" off \ AVAHI "Enable AVAHI" on \ diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index efde69268..6b2ba10c3 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/json-glib/Makefile,v 1.14 2011/01/13 02:19:43 kwm Exp $ +# $MCom: ports/devel/json-glib/Makefile,v 1.15 2011/04/12 09:11:47 kwm Exp $ # PORTNAME= json-glib @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GNOME= glib20 gnomehack gnomeprefix ltverhack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index ecc4289fc..f1a55946f 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -3,7 +3,7 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ -# $MCom: ports/devel/libnotify/Makefile,v 1.19 2011/05/10 06:59:31 kwm Exp $ +# $MCom: ports/devel/libnotify/Makefile,v 1.20 2011/06/10 17:04:17 kwm Exp $ # PORTNAME= libnotify @@ -26,7 +26,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index f90f4555b..fc285387a 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/liboobs/Makefile,v 1.50 2010/09/27 17:46:12 kwm Exp $ +# $MCom: ports/devel/liboobs/Makefile,v 1.52 2011/04/04 09:31:41 kwm Exp $ # PORTNAME= liboobs @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 83836f082..fab3da934 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.102 2011/06/06 17:50:29 kwm Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.103 2011/06/09 16:27:51 mezz Exp $ # PORTNAME= libsoup @@ -70,7 +70,7 @@ post-install: .else @${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ ${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h -.endif +.endif .include <bsd.port.post.mk> diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index a2f840878..957ddaa8d 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-dbus/Makefile,v 1.10 2010/03/14 12:28:57 kwm Exp $ +# $MCom: ports/devel/py-dbus/Makefile,v 1.12 2011/06/03 18:46:17 kwm Exp $ # PORTNAME= dbus @@ -23,7 +23,7 @@ USE_GNOME= gnomehack gnometarget USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${PYTHON_INCLUDEDIR}" +CPPFLAGS= -I${PYTHON_INCLUDEDIR} CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --disable-api-docs diff --git a/devel/seed/Makefile b/devel/seed/Makefile index 589b31e30..8e973a0e4 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/seed/Makefile,v 1.29 2011/04/22 03:35:00 mezz Exp $ +# $MCom: ports/devel/seed/Makefile,v 1.30 2011/04/30 20:43:16 mezz Exp $ # # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. @@ -36,8 +36,8 @@ USE_GNOME= gnomehack gtk20 intltool libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0 MAN1= seed.1 diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile index ad843cbb9..c6fe23ce4 100644 --- a/devel/seed3/Makefile +++ b/devel/seed3/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/seed3/Makefile,v 1.7 2011/04/30 20:43:16 mezz Exp $ +# $MCom: ports/devel/seed3/Makefile,v 1.8 2011/06/10 22:59:03 mezz Exp $ # # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. @@ -36,8 +36,8 @@ USE_GNOME= gnomehack gtk30 intltool libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=3.0 DATADIR= share/seed-gtk3 |