Convert to using the new gconf2.port.mk module.

input and ok jasper@
This commit is contained in:
ajacoutot 2009-06-07 05:31:10 +00:00
parent 49bc9d04b5
commit 10b6eb2bd8
4 changed files with 28 additions and 25 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2009/04/16 08:11:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2009/06/07 05:31:10 ajacoutot Exp $
COMMENT= editor for the GConf configuration system
GNOME_PROJECT= gconf-editor
GNOME_VERSION= 2.24.1
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/projects/gconf/
@ -19,7 +19,7 @@ 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 bonobo-2 bonobo-activation \
bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \
fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \
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 \
@ -29,16 +29,16 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui
MODULES= devel/gettext \
x11/gnome
x11/gnome \
devel/gconf2
USE_X11= Yes
DESKTOP_FILES= Yes
MODGNOME_HELP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= gconf-editor
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gconf-editor \
--disable-schemas-install
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2009/03/14 10:40:51 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.17 2009/06/07 05:31:10 ajacoutot Exp $
@bin bin/gconf-editor
@man man/man1/gconf-editor.1
share/applications/gconf-editor.desktop
@ -161,10 +161,10 @@ share/omf/gconf-editor/gconf-editor-ru.omf
share/omf/gconf-editor/gconf-editor-sv.omf
share/omf/gconf-editor/gconf-editor-th.omf
share/omf/gconf-editor/gconf-editor-uk.omf
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gconf-editor/*.schemas > /dev/null
share/schemas/gconf-editor/
share/schemas/gconf-editor/gconf-editor.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gconf-editor/*.schemas > /dev/null
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/gconf-editor.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2009/05/24 10:56:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2009/06/07 05:31:10 ajacoutot Exp $
COMMENT-main= GNOME Structured File library
COMMENT-gnome= GNOME specific extensions to libgsf
@ -7,7 +7,7 @@ GNOME_PROJECT= libgsf
GNOME_VERSION= 1.14.14
PKGNAME-main= ${DISTNAME}
PKGNAME-gnome= libgsf-gnome-${VERSION}
PKGNAME-gnome= libgsf-gnome-${VERSION}p0
CATEGORIES= devel
@ -31,7 +31,8 @@ WANTLIB= c m z pcre
MODULES= devel/gettext \
lang/python \
x11/gnome
x11/gnome \
devel/gconf2
BUILD_DEPENDS= :py-gtk2->=2.10:x11/py-gtk2 \
:popt-*:devel/popt
@ -39,23 +40,25 @@ LIB_DEPENDS= bz2.>=10.2::archivers/bzip2 \
gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \
xml2.>=8.4::textproc/libxml
MODGCONF2_LIBDEP= No
MODGCONF2_SCHEMAS_DIR= libgsf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-bz2 \
--disable-schemas-install \
--with-python \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libgsf
--with-python
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= GCONF2_SCHEMAS_DIR="${LOCALBASE}/share/schemas/libgsf"
MAKE_ENV+= GCONF2_SCHEMAS_DIR="${LOCALBASE}/${SCHEMAS_INSTDIR}"
LIB_DEPENDS-gnome= ${LIB_DEPENDS} \
${MODGCONF2_LIB_DEPENDS} \
gsf-1::${BUILD_PKGPATH} \
gnomevfs-2.>=1800:gnome-vfs2->=2.18:x11/gnome/vfs2 \
bonobo-2,bonobo-activation::x11/gnome/libbonobo
WANTLIB-gnome= ${WANTLIB} crypto ssl ORBit-2 ORBitCosNaming-2 \
bonobo-activation gobject-2.0 gthread-2.0 util xml2 \
bz2 dbus-1 dbus-glib-1 gconf-2 glib-2.0 gmodule-2.0
bz2 dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gnome,v 1.5 2008/09/07 22:21:10 brad Exp $
@comment $OpenBSD: PLIST-gnome,v 1.6 2009/06/07 05:31:10 ajacoutot Exp $
%%SHARED%%
@bin bin/gsf-office-thumbnailer
include/libgsf-1/gsf-gnome/
@ -10,7 +10,7 @@ include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
lib/libgsf-gnome-1.a
lib/libgsf-gnome-1.la
lib/pkgconfig/libgsf-gnome-1.pc
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/libgsf/*.schemas > /dev/null
share/schemas/libgsf/
share/schemas/libgsf/gsf-office-thumbnailer.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/libgsf/*.schemas > /dev/null
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/gsf-office-thumbnailer.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null