diff options
| -rw-r--r-- | devel/libgnome/Makefile | 5 | ||||
| -rw-r--r-- | devel/libgnome/buildlink3.mk | 10 | ||||
| -rw-r--r-- | devel/libgnome/options.mk | 15 |
3 files changed, 3 insertions, 27 deletions
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index a48ea59a652..79ad152f38f 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2020/01/18 21:48:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.123 2020/01/20 21:14:14 nia Exp $ # DISTNAME= libgnome-2.32.1 @@ -20,6 +20,7 @@ USE_PKGLOCALEDIR= YES PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no +CONFIGURE_ARGS+= --disable-esd CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} @@ -54,8 +55,6 @@ GCONF_SCHEMAS+= desktop_gnome_applications_at_mobility.schemas GCONF_SCHEMAS+= desktop_gnome_applications_at_visual.schemas GCONF_SCHEMAS+= desktop_gnome_applications_office.schemas -.include "options.mk" - .include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index d9f0f9d8ecb..35a16ce32be 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.63 2020/01/18 21:48:06 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.64 2020/01/20 21:14:14 nia Exp $ BUILDLINK_TREE+= libgnome @@ -9,14 +9,6 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.32.1nb36 BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome -.include "../../mk/bsd.fast.prefs.mk" - -pkgbase := libgnome -.include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.libgnome:Mesound) -.include "../../audio/esound/buildlink3.mk" -.endif - .include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/devel/libgnome/options.mk b/devel/libgnome/options.mk deleted file mode 100644 index 687a7ff0508..00000000000 --- a/devel/libgnome/options.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2011/03/11 11:42:35 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.libgnome -PKG_SUPPORTED_OPTIONS= esound - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mesound) -BUILDLINK_API_DEPENDS.esound+= esound>=0.2.26 -.include "../../audio/esound/buildlink3.mk" -BUILDLINK_API_DEPENDS.audiofile+= libaudiofile>=0.2.3 -.include "../../audio/libaudiofile/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-esd -.endif |