From 77716baf9fc6e07494248cf128d09e4747b9625c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 19 Mar 2012 10:28:48 +0000 Subject: [PATCH] Our pkg-config(1) can now cope with files under share/pkgconfig, so remove these now unneeded hacks/patches. --- audio/mono-taglib/Makefile | 6 ++---- audio/mono-taglib/pkg/PLIST | 4 ++-- devel/gsettings-desktop-schemas/Makefile | 5 ++--- devel/gsettings-desktop-schemas/pkg/PLIST | 6 +++--- devel/mm-common/Makefile | 5 ++--- devel/mm-common/pkg/PLIST | 8 ++++---- lang/vala/Makefile | 4 ++-- lang/vala/pkg/PLIST | 7 ++++--- math/eigen2/Makefile | 5 ++--- math/eigen2/patches/patch-CMakeLists_txt | 12 ------------ math/eigen2/pkg/PLIST | 6 +++--- misc/shared-desktop-ontologies/Makefile | 5 ++--- misc/shared-desktop-ontologies/pkg/PLIST | 6 +++--- misc/shared-mime-info/Makefile | 5 ++--- misc/shared-mime-info/pkg/PLIST | 6 +++--- textproc/gtk-doc/Makefile | 6 ++---- textproc/gtk-doc/pkg/PLIST | 4 ++-- x11/gnome/doc-utils/Makefile | 5 ++--- x11/gnome/doc-utils/pkg/PLIST | 7 ++++--- x11/gnome/icon-theme/Makefile | 6 ++---- x11/gnome/icon-theme/pkg/PLIST | 5 +++-- x11/gnome/mime-data/Makefile | 7 +++---- x11/gnome/mime-data/pkg/PLIST | 6 +++--- x11/gnome/yelp-xsl/Makefile | 5 ++--- x11/gnome/yelp-xsl/pkg/PLIST | 6 +++--- x11/icon-naming-utils/Makefile | 3 ++- x11/icon-naming-utils/patches/patch-Makefile_in | 12 ------------ x11/icon-naming-utils/pkg/PLIST | 6 +++--- 28 files changed, 67 insertions(+), 101 deletions(-) delete mode 100644 math/eigen2/patches/patch-CMakeLists_txt delete mode 100644 x11/icon-naming-utils/patches/patch-Makefile_in diff --git a/audio/mono-taglib/Makefile b/audio/mono-taglib/Makefile index 57f4a527d90..cdf6cc7eca0 100644 --- a/audio/mono-taglib/Makefile +++ b/audio/mono-taglib/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/15 00:22:47 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= tagging library for the Mono framework V= 2.0.3.7 DISTNAME= taglib-sharp-${V} PKGNAME= mono-taglib-${V} -REVISION= 0 +REVISION= 1 CATEGORIES= audio @@ -30,6 +30,4 @@ DLLMAP_FILES= src/policy.2.0.taglib-sharp.config CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --disable-docs -FAKE_FLAGS= pkgconfigdir="${PREFIX}/lib/pkgconfig/" - .include diff --git a/audio/mono-taglib/pkg/PLIST b/audio/mono-taglib/pkg/PLIST index 9c90bdba059..bdb23417dc2 100644 --- a/audio/mono-taglib/pkg/PLIST +++ b/audio/mono-taglib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/28 18:19:31 robert Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/03/19 10:28:48 ajacoutot Exp $ lib/mono/gac/policy.2.0.taglib-sharp/ lib/mono/gac/policy.2.0.taglib-sharp/0.0.0.0__db62eba44689b5b0/ lib/mono/gac/policy.2.0.taglib-sharp/0.0.0.0__db62eba44689b5b0/policy.2.0.taglib-sharp.config @@ -9,4 +9,4 @@ lib/mono/gac/taglib-sharp/2.0.3.7__db62eba44689b5b0/taglib-sharp.dll lib/mono/gac/taglib-sharp/2.0.3.7__db62eba44689b5b0/taglib-sharp.dll.mdb lib/mono/taglib-sharp/ lib/mono/taglib-sharp/taglib-sharp.dll -lib/pkgconfig/taglib-sharp.pc +share/pkgconfig/taglib-sharp.pc diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index 4212389ab90..8743510124e 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.23 2011/09/26 09:44:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= collection of shared GSettings schemas GNOME_PROJECT= gsettings-desktop-schemas GNOME_VERSION= 3.2.0 +REVISION= 0 CATEGORIES= devel @@ -25,6 +26,4 @@ USE_LIBTOOL= No CONFIGURE_STYLE=gnu -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig - .include diff --git a/devel/gsettings-desktop-schemas/pkg/PLIST b/devel/gsettings-desktop-schemas/pkg/PLIST index 682e0098107..6e4cfc9a9ba 100644 --- a/devel/gsettings-desktop-schemas/pkg/PLIST +++ b/devel/gsettings-desktop-schemas/pkg/PLIST @@ -1,8 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.9 2011/09/26 09:44:09 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2012/03/19 10:28:48 ajacoutot Exp $ include/gsettings-desktop-schemas/ include/gsettings-desktop-schemas/gdesktop-enums.h -lib/pkgconfig/ -lib/pkgconfig/gsettings-desktop-schemas.pc share/GConf/ share/GConf/gsettings/ share/GConf/gsettings/gsettings-desktop-schemas.convert @@ -34,5 +32,7 @@ share/locale/sl/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sv/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/vi/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/zh_CN/LC_MESSAGES/gsettings-desktop-schemas.mo +share/pkgconfig/ +share/pkgconfig/gsettings-desktop-schemas.pc @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile index 90dbb5eb8f3..40c8fb4d9a7 100644 --- a/devel/mm-common/Makefile +++ b/devel/mm-common/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2011/09/12 12:07:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= common build utilities for GNOME C++ binding libraries GNOME_PROJECT= mm-common GNOME_VERSION= 0.9.5 +REVISION= 0 CATEGORIES= devel @@ -26,6 +27,4 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= ac_cv_prog_WGET="" \ ac_cv_prog_CURL="" -FAKE_FLAGS= shared_pkgconfigdir=${TRUEPREFIX}/lib/pkgconfig - .include diff --git a/devel/mm-common/pkg/PLIST b/devel/mm-common/pkg/PLIST index 4cf98131b97..35a66a3910a 100644 --- a/devel/mm-common/pkg/PLIST +++ b/devel/mm-common/pkg/PLIST @@ -1,8 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2011/03/21 12:36:18 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/03/19 10:28:48 ajacoutot Exp $ bin/mm-common-prepare -lib/pkgconfig/ -lib/pkgconfig/mm-common-libstdc++.pc -lib/pkgconfig/mm-common-util.pc @man man/man1/mm-common-prepare.1 share/aclocal/ share/aclocal/mm-common.m4 @@ -27,3 +24,6 @@ share/mm-common/doctool/doc-install.pl share/mm-common/doctool/doc-postprocess.pl share/mm-common/doctool/doxygen.css share/mm-common/doctool/tagfile-to-devhelp2.xsl +share/pkgconfig/ +share/pkgconfig/mm-common-libstdc++.pc +share/pkgconfig/mm-common-util.pc diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 16ab12e8a70..96a96f082fd 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.48 2012/03/18 16:05:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.49 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= compiler for the GObject type system GNOME_PROJECT= vala GNOME_VERSION= 0.15.2 API_V= 0.16 -REVISION= 0 +REVISION= 1 SHARED_LIBS += vala-0.16 0.0 # 0.0 diff --git a/lang/vala/pkg/PLIST b/lang/vala/pkg/PLIST index ea3884bb09e..d0b191a08b3 100644 --- a/lang/vala/pkg/PLIST +++ b/lang/vala/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.29 2012/03/18 16:05:30 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.30 2012/03/19 10:28:48 ajacoutot Exp $ %%SHARED%% bin/vala bin/vala-${API_V} @@ -19,8 +19,6 @@ lib/libvala-${API_V}.a lib/libvala-${API_V}.la lib/pkgconfig/ lib/pkgconfig/libvala-${API_V}.pc -lib/pkgconfig/vapigen-${API_V}.pc -lib/pkgconfig/vapigen.pc lib/vala-${API_V}/ @bin lib/vala-${API_V}/gen-introspect-${API_V} @man man/man1/vala-gen-introspect-${API_V}.1 @@ -50,6 +48,9 @@ share/devhelp/books/vala-${API_V}/statements.html share/devhelp/books/vala-${API_V}/structs.html share/devhelp/books/vala-${API_V}/types.html share/devhelp/books/vala-${API_V}/vala-${API_V}.devhelp2 +share/pkgconfig/ +share/pkgconfig/vapigen-${API_V}.pc +share/pkgconfig/vapigen.pc share/vala/ share/vala-${API_V}/ share/vala-${API_V}/vapi/ diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile index a281a55b11c..f80d67c0090 100644 --- a/math/eigen2/Makefile +++ b/math/eigen2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2011/07/17 09:52:44 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2012/03/19 10:28:48 ajacoutot Exp $ PKG_ARCH = * COMMENT = lightweight C++ template library for linear algebra @@ -11,10 +11,9 @@ VERSION = 2.0.14 DISTNAME = ${VERSION} PKGNAME = eigen2-${VERSION} WRKDIST = ${WRKDIR}/eigen-eigen-f30db88dec8b -REVISION = 0 +REVISION = 1 # relaxed GPL (LGPL for template libs) - PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes diff --git a/math/eigen2/patches/patch-CMakeLists_txt b/math/eigen2/patches/patch-CMakeLists_txt deleted file mode 100644 index 7a30276c380..00000000000 --- a/math/eigen2/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1 2011/06/05 14:28:53 jasper Exp $ ---- CMakeLists.txt.orig Sun Jun 5 16:17:16 2011 -+++ CMakeLists.txt Sun Jun 5 16:17:19 2011 -@@ -120,7 +120,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAK - if(EIGEN_BUILD_PKGCONFIG) - configure_file(eigen2.pc.in eigen2.pc) # uses INCLUDE_INSTALL_DIR - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen2.pc -- DESTINATION share/pkgconfig -+ DESTINATION lib/pkgconfig - ) - endif(EIGEN_BUILD_PKGCONFIG) - diff --git a/math/eigen2/pkg/PLIST b/math/eigen2/pkg/PLIST index 1b806db8299..358e5cc0d50 100644 --- a/math/eigen2/pkg/PLIST +++ b/math/eigen2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2011/06/05 14:28:53 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/03/19 10:28:48 ajacoutot Exp $ include/eigen2/ include/eigen2/Eigen/ include/eigen2/Eigen/Array @@ -143,5 +143,5 @@ include/eigen2/unsupported/Eigen/src/ include/eigen2/unsupported/Eigen/src/IterativeSolvers/ include/eigen2/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h include/eigen2/unsupported/Eigen/src/IterativeSolvers/IterationController.h -lib/pkgconfig/ -lib/pkgconfig/eigen2.pc +share/pkgconfig/ +share/pkgconfig/eigen2.pc diff --git a/misc/shared-desktop-ontologies/Makefile b/misc/shared-desktop-ontologies/Makefile index 6a08db099ae..33c251d9af1 100644 --- a/misc/shared-desktop-ontologies/Makefile +++ b/misc/shared-desktop-ontologies/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2011/07/07 02:34:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT = shared desktop ontologies PKG_ARCH = * DISTNAME = shared-desktop-ontologies-0.7.1 EXTRACT_SUFX = .tar.bz2 +REVISION = 0 HOMEPAGE = http://sourceforge.net/apps/trac/oscaf/ @@ -21,8 +22,6 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/cmake -CONFIGURE_ARGS += -DPKGCONFIG_INSTALL_DIR:STRING="lib/pkgconfig/" - NO_REGRESS = Yes .include diff --git a/misc/shared-desktop-ontologies/pkg/PLIST b/misc/shared-desktop-ontologies/pkg/PLIST index a614c04daf7..4398c22d7c2 100644 --- a/misc/shared-desktop-ontologies/pkg/PLIST +++ b/misc/shared-desktop-ontologies/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2011/06/05 14:37:16 jasper Exp $ -lib/pkgconfig/ -lib/pkgconfig/shared-desktop-ontologies.pc +@comment $OpenBSD: PLIST,v 1.3 2012/03/19 10:28:48 ajacoutot Exp $ share/cmake/ share/cmake/SharedDesktopOntologies/ share/cmake/SharedDesktopOntologies/SharedDesktopOntologiesConfig.cmake @@ -51,3 +49,5 @@ share/ontology/pimo/pimo.ontology share/ontology/pimo/pimo.trig share/ontology/pimo/tmo.ontology share/ontology/pimo/tmo.trig +share/pkgconfig/ +share/pkgconfig/shared-desktop-ontologies.pc diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 175bf153085..07c0fb9523a 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.40 2012/02/16 22:22:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.41 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= shared mime database for desktops DISTNAME= shared-mime-info-1.0 CATEGORIES= misc +REVISION= 0 HOMEPAGE= http://www.freedesktop.org/wiki/Software/shared-mime-info @@ -32,8 +33,6 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig - pre-configure: @perl -pi -e 's|/usr/local|${PREFIX}|g' \ ${WRKSRC}/update-mime-database.c \ diff --git a/misc/shared-mime-info/pkg/PLIST b/misc/shared-mime-info/pkg/PLIST index 2a9eb444254..899325b4338 100644 --- a/misc/shared-mime-info/pkg/PLIST +++ b/misc/shared-mime-info/pkg/PLIST @@ -1,11 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.23 2011/10/16 06:41:07 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.24 2012/03/19 10:28:48 ajacoutot Exp $ share/mime/ share/mime/packages/ share/mime/packages/freedesktop.org.xml @unexec-delete %D/bin/update-mime-database %D/share/mime @bin bin/update-mime-database -lib/pkgconfig/ -lib/pkgconfig/shared-mime-info.pc @man man/man1/update-mime-database.1 share/locale/ar/ share/locale/ar/LC_MESSAGES/ @@ -135,4 +133,6 @@ share/mime/version share/mime/video/ share/mime/x-content/ share/mime/x-epoc/ +share/pkgconfig/ +share/pkgconfig/shared-mime-info.pc @exec %D/bin/update-mime-database %D/share/mime diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 79548a8c280..de2581222f5 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.30 2011/09/20 21:04:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= GTK C code documentation system GNOME_VERSION= 1.18 GNOME_PROJECT= gtk-doc -REVISION= 0 +REVISION= 1 CATEGORIES= textproc devel @@ -37,8 +37,6 @@ RUN_DEPENDS= textproc/openjade \ REGRESS_DEPENDS= shells/bash -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig/ - post-extract: cp ${LOCALBASE}/share/xml/docbook/catalog.xml \ ${WRKDIR}/catalog.xml diff --git a/textproc/gtk-doc/pkg/PLIST b/textproc/gtk-doc/pkg/PLIST index b815e4088c5..5d255b224f5 100644 --- a/textproc/gtk-doc/pkg/PLIST +++ b/textproc/gtk-doc/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.12 2011/09/14 15:35:40 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.13 2012/03/19 10:28:48 ajacoutot Exp $ bin/gtkdoc-check bin/gtkdoc-depscan bin/gtkdoc-fixxref @@ -12,7 +12,6 @@ bin/gtkdoc-scan bin/gtkdoc-scangobj bin/gtkdoc-scanobj bin/gtkdocize -lib/pkgconfig/gtk-doc.pc share/aclocal/gtk-doc.m4 share/gnome/ share/gnome/help/ @@ -72,5 +71,6 @@ share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf share/omf/gtk-doc-manual/gtk-doc-manual-te.omf +share/pkgconfig/gtk-doc.pc share/sgml/gtk-doc/ share/sgml/gtk-doc/gtk-doc.cat diff --git a/x11/gnome/doc-utils/Makefile b/x11/gnome/doc-utils/Makefile index bf6fe6f671a..5df32f667ed 100644 --- a/x11/gnome/doc-utils/Makefile +++ b/x11/gnome/doc-utils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2012/03/19 07:36:27 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.54 2012/03/19 10:28:48 ajacoutot Exp $ # This port does set MODGNOME_TOOLS=yelp on purpose: it would create a # dependency on itself. We do not enforce dependency on x11/gnome/yelp @@ -8,6 +8,7 @@ COMMENT= collection of documentation utilities for the GNOME project GNOME_PROJECT= gnome-doc-utils GNOME_VERSION= 0.20.8 +REVISION= 0 CATEGORIES= textproc @@ -33,8 +34,6 @@ RUN_DEPENDS= devel/gettext \ USE_LIBTOOL= No USE_GROFF= Yes -FAKE_FLAGS+= pkgconfigdir="${PREFIX}/lib/pkgconfig/" - pre-configure: ${SUBST_CMD} ${WRKSRC}/xml2po/xml2po.1 diff --git a/x11/gnome/doc-utils/pkg/PLIST b/x11/gnome/doc-utils/pkg/PLIST index 1168e11dac3..5c47c8f333d 100644 --- a/x11/gnome/doc-utils/pkg/PLIST +++ b/x11/gnome/doc-utils/pkg/PLIST @@ -1,9 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.14 2012/03/03 10:30:56 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.15 2012/03/19 10:28:48 ajacoutot Exp $ bin/gnome-doc-prepare bin/gnome-doc-tool bin/xml2po -lib/pkgconfig/gnome-doc-utils.pc -lib/pkgconfig/xml2po.pc lib/python${MODPY_VERSION}/site-packages/xml2po/ lib/python${MODPY_VERSION}/site-packages/xml2po/__init__.py lib/python${MODPY_VERSION}/site-packages/xml2po/__init__.pyc @@ -307,6 +305,9 @@ share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo +share/pkgconfig/ +share/pkgconfig/gnome-doc-utils.pc +share/pkgconfig/xml2po.pc share/xml/gnome/ share/xml/gnome/xslt/ share/xml/gnome/xslt/common/ diff --git a/x11/gnome/icon-theme/Makefile b/x11/gnome/icon-theme/Makefile index 06d3e29260c..2c1e2a5e73a 100644 --- a/x11/gnome/icon-theme/Makefile +++ b/x11/gnome/icon-theme/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.48 2011/12/03 18:45:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.49 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= base icon theme for GNOME GNOME_PROJECT= gnome-icon-theme GNOME_VERSION= 3.2.1.1 -REVISION= 1 +REVISION= 2 CATEGORIES= x11 @@ -33,8 +33,6 @@ CONFIGURE_ARGS= --enable-icon-mapping \ EXAMPLEDIR= ${PREFIX}/share/examples/${GNOME_PROJECT} -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig - # no need to build_depends on gtk+2|gtk+3, we run gtk-update-icon-cache # at pkg_add time if it is available post-extract: diff --git a/x11/gnome/icon-theme/pkg/PLIST b/x11/gnome/icon-theme/pkg/PLIST index a715c7d706c..68c4b350541 100644 --- a/x11/gnome/icon-theme/pkg/PLIST +++ b/x11/gnome/icon-theme/pkg/PLIST @@ -1,6 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.36 2011/12/03 18:45:02 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.37 2012/03/19 10:28:48 ajacoutot Exp $ @unexec-delete rm -f %D/share/icons/gnome/icon-theme.cache -lib/pkgconfig/gnome-icon-theme.pc share/examples/gnome-icon-theme/ share/examples/gnome-icon-theme/gtk-2.0/ @sample ${SYSCONFDIR}/gtk-2.0/ @@ -5895,4 +5894,6 @@ share/icons/gnome/8x8/emblems/emblem-symbolic-link.png share/icons/gnome/8x8/emblems/emblem-synchronizing.png share/icons/gnome/8x8/emblems/emblem-unreadable.png share/icons/gnome/index.theme +share/pkgconfig/ +share/pkgconfig/gnome-icon-theme.pc @exec %D/bin/gtk-update-icon-cache -q %D/share/icons/gnome 2>/dev/null || true diff --git a/x11/gnome/mime-data/Makefile b/x11/gnome/mime-data/Makefile index f158589e42e..aa456de861b 100644 --- a/x11/gnome/mime-data/Makefile +++ b/x11/gnome/mime-data/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.30 2011/09/28 09:47:47 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= MIME and application database for GNOME GNOME_PROJECT= gnome-mime-data GNOME_VERSION= 2.18.0 CATEGORIES= x11 -REVISION= 4 +REVISION= 5 # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -20,7 +20,6 @@ MODULES= x11/gnome USE_LIBTOOL= No CONFIGURE_STYLE= gnu old -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig/ \ - sysconfdir=${PREFIX}/share/examples/gnome-mime-data/ +FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-mime-data/ .include diff --git a/x11/gnome/mime-data/pkg/PLIST b/x11/gnome/mime-data/pkg/PLIST index a6de288535d..91bc3e7ff74 100644 --- a/x11/gnome/mime-data/pkg/PLIST +++ b/x11/gnome/mime-data/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.12 2011/01/18 20:03:07 ajacoutot Exp $ -lib/pkgconfig/ -lib/pkgconfig/gnome-mime-data-2.0.pc +@comment $OpenBSD: PLIST,v 1.13 2012/03/19 10:28:48 ajacoutot Exp $ share/application-registry/ share/application-registry/gnome-vfs.applications share/examples/gnome-mime-data/ @@ -229,3 +227,5 @@ share/locale/zu/LC_MESSAGES/gnome-mime-data.mo share/mime-info/ share/mime-info/gnome-vfs.keys share/mime-info/gnome-vfs.mime +share/pkgconfig/ +share/pkgconfig/gnome-mime-data-2.0.pc diff --git a/x11/gnome/yelp-xsl/Makefile b/x11/gnome/yelp-xsl/Makefile index fcd3cdc703c..244bfea5abc 100644 --- a/x11/gnome/yelp-xsl/Makefile +++ b/x11/gnome/yelp-xsl/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2011/10/17 17:52:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= XSLT stylesheets for yelp GNOME_PROJECT= yelp-xsl GNOME_VERSION= 3.2.1 +REVISION= 0 # GPLv2 - LGPLv2.1 - MIT PERMIT_PACKAGE_CDROM= Yes @@ -19,6 +20,4 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \ RUN_DEPENDS= devel/gettext \ textproc/libxslt -FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig - .include diff --git a/x11/gnome/yelp-xsl/pkg/PLIST b/x11/gnome/yelp-xsl/pkg/PLIST index c10c9715201..34e9e5b7c15 100644 --- a/x11/gnome/yelp-xsl/pkg/PLIST +++ b/x11/gnome/yelp-xsl/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2011/10/17 17:52:11 ajacoutot Exp $ -lib/pkgconfig/ -lib/pkgconfig/yelp-xsl.pc +@comment $OpenBSD: PLIST,v 1.5 2012/03/19 10:28:48 ajacoutot Exp $ share/locale/ar/ share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/yelp-xsl.mo @@ -154,6 +152,8 @@ share/locale/wa/LC_MESSAGES/yelp-xsl.mo share/locale/zh_CN/LC_MESSAGES/yelp-xsl.mo share/locale/zh_HK/LC_MESSAGES/yelp-xsl.mo share/locale/zh_TW/LC_MESSAGES/yelp-xsl.mo +share/pkgconfig/ +share/pkgconfig/yelp-xsl.pc share/yelp-xsl/ share/yelp-xsl/icons/ share/yelp-xsl/icons/hicolor/ diff --git a/x11/icon-naming-utils/Makefile b/x11/icon-naming-utils/Makefile index a2d3d2385cb..8828f3858af 100644 --- a/x11/icon-naming-utils/Makefile +++ b/x11/icon-naming-utils/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/22 08:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2012/03/19 10:28:48 ajacoutot Exp $ COMMENT= compatibility tools from the Tango project DISTNAME= icon-naming-utils-0.8.90 CATEGORIES= x11 +REVISION= 0 HOMEPAGE= http://tango.freedesktop.org/ diff --git a/x11/icon-naming-utils/patches/patch-Makefile_in b/x11/icon-naming-utils/patches/patch-Makefile_in deleted file mode 100644 index c8158761a3d..00000000000 --- a/x11/icon-naming-utils/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2007/10/22 22:00:17 jasper Exp $ ---- Makefile.in.orig Fri Oct 19 16:15:36 2007 -+++ Makefile.in Fri Oct 19 16:15:49 2007 -@@ -149,7 +149,7 @@ libexec_SCRIPTS = icon-name-mapping - pkgconfig_in_files = \ - icon-naming-utils.pc.in - --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc) - dtddir = $(datadir)/dtds - dtd_DATA = legacy-icon-mapping.dtd diff --git a/x11/icon-naming-utils/pkg/PLIST b/x11/icon-naming-utils/pkg/PLIST index 17b3a6319a2..99cbf45165d 100644 --- a/x11/icon-naming-utils/pkg/PLIST +++ b/x11/icon-naming-utils/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/17 00:07:42 alek Exp $ -lib/pkgconfig/ -lib/pkgconfig/icon-naming-utils.pc +@comment $OpenBSD: PLIST,v 1.2 2012/03/19 10:28:48 ajacoutot Exp $ libexec/icon-name-mapping share/dtds/ share/dtds/legacy-icon-mapping.dtd share/icon-naming-utils/ share/icon-naming-utils/legacy-icon-mapping.xml +share/pkgconfig/ +share/pkgconfig/icon-naming-utils.pc