From af61eeeace16bb65fcb2d0e775561658cb8d73ff Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 29 Jan 2009 15:34:15 +0000 Subject: [PATCH] - sanitize WANTLIB+LIB_DEPENDS - remove esd/audiofile from WANTLIB - add CONFIGURE_SHARED - regen PLIST while here --- devel/gconf-editor/Makefile | 24 ++++++++++++------------ devel/gconf-editor/pkg/PLIST | 20 +------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/devel/gconf-editor/Makefile b/devel/gconf-editor/Makefile index 24fce0c271e..fe88ded6730 100644 --- a/devel/gconf-editor/Makefile +++ b/devel/gconf-editor/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.29 2008/12/17 18:40:57 jasper Exp $ +# $OpenBSD: Makefile,v 1.30 2009/01/29 15:34:15 ajacoutot Exp $ COMMENT= editor for the GConf configuration system GNOME_PROJECT= gconf-editor GNOME_VERSION= 2.24.1 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= devel HOMEPAGE= http://www.gnome.org/projects/gconf/ @@ -17,21 +17,19 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ - Xrender art_lgpl_2 atk-1.0 audiofile bonobo-2 bonobo-activation \ - bonoboui-2 c cairo crypto esd expat fontconfig freetype \ - gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ - glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 \ - gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \ + Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation \ + bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \ + fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \ + gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \ + gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 \ + gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt \ pthread ssl util xml2 z BUILD_DEPENDS= ::textproc/rarian \ :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils RUN_DEPENDS= ::textproc/rarian -LIB_DEPENDS= gconf-2::devel/gconf2 \ - dbus-1::x11/dbus \ - dbus-glib-1::x11/dbus-glib \ - gnomeui-2::x11/gnome/libgnomeui +LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui MODULES= devel/gettext \ x11/gnome @@ -39,8 +37,10 @@ MODULES= devel/gettext \ USE_X11= Yes DESKTOP_FILES= Yes MODGNOME_HELP_FILES= Yes + CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gconf-editor \ +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gconf-editor \ --disable-schemas-install CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/gconf-editor/pkg/PLIST b/devel/gconf-editor/pkg/PLIST index b22d60e96e8..bca10004103 100644 --- a/devel/gconf-editor/pkg/PLIST +++ b/devel/gconf-editor/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2008/12/17 18:40:57 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.15 2009/01/29 15:34:15 ajacoutot Exp $ @bin bin/gconf-editor @man man/man1/gconf-editor.1 share/applications/gconf-editor.desktop @@ -68,19 +68,11 @@ share/gnome/help/gconf-editor/uk/gconf-editor.xml share/icons/hicolor/48x48/ share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/gconf-editor.png -share/locale/am/ -share/locale/am/LC_MESSAGES/ share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo -share/locale/as/ -share/locale/as/LC_MESSAGES/ share/locale/as/LC_MESSAGES/gconf-editor.mo -share/locale/az/ -share/locale/az/LC_MESSAGES/ share/locale/az/LC_MESSAGES/gconf-editor.mo share/locale/be/LC_MESSAGES/gconf-editor.mo -share/locale/be@latin/ -share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/gconf-editor.mo share/locale/bg/LC_MESSAGES/gconf-editor.mo share/locale/bn/LC_MESSAGES/gconf-editor.mo @@ -113,8 +105,6 @@ share/locale/id/LC_MESSAGES/gconf-editor.mo share/locale/it/LC_MESSAGES/gconf-editor.mo share/locale/ja/LC_MESSAGES/gconf-editor.mo share/locale/ka/LC_MESSAGES/gconf-editor.mo -share/locale/kn/ -share/locale/kn/LC_MESSAGES/ share/locale/kn/LC_MESSAGES/gconf-editor.mo share/locale/ko/LC_MESSAGES/gconf-editor.mo share/locale/ku/LC_MESSAGES/gconf-editor.mo @@ -131,8 +121,6 @@ share/locale/nb/LC_MESSAGES/gconf-editor.mo share/locale/ne/LC_MESSAGES/gconf-editor.mo share/locale/nl/LC_MESSAGES/gconf-editor.mo share/locale/nn/LC_MESSAGES/gconf-editor.mo -share/locale/oc/ -share/locale/oc/LC_MESSAGES/ share/locale/oc/LC_MESSAGES/gconf-editor.mo share/locale/or/LC_MESSAGES/gconf-editor.mo share/locale/pa/LC_MESSAGES/gconf-editor.mo @@ -142,20 +130,14 @@ share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo share/locale/ro/LC_MESSAGES/gconf-editor.mo share/locale/ru/LC_MESSAGES/gconf-editor.mo share/locale/rw/LC_MESSAGES/gconf-editor.mo -share/locale/si/ -share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/gconf-editor.mo share/locale/sk/LC_MESSAGES/gconf-editor.mo share/locale/sl/LC_MESSAGES/gconf-editor.mo share/locale/sq/LC_MESSAGES/gconf-editor.mo share/locale/sr/LC_MESSAGES/gconf-editor.mo -share/locale/sr@latin/ -share/locale/sr@latin/LC_MESSAGES/ share/locale/sr@latin/LC_MESSAGES/gconf-editor.mo share/locale/sv/LC_MESSAGES/gconf-editor.mo share/locale/ta/LC_MESSAGES/gconf-editor.mo -share/locale/te/ -share/locale/te/LC_MESSAGES/ share/locale/te/LC_MESSAGES/gconf-editor.mo share/locale/th/LC_MESSAGES/gconf-editor.mo share/locale/tr/LC_MESSAGES/gconf-editor.mo