CVS commit: pkgsrc/devel/libgnome

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jan 20 21:14:14 UTC 2020

Modified Files:
        pkgsrc/devel/libgnome: Makefile buildlink3.mk
Removed Files:
        pkgsrc/devel/libgnome: options.mk

Log Message:
libgnome: Remove esound support


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/devel/libgnome/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/libgnome/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libgnome/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libgnome/Makefile
diff -u pkgsrc/devel/libgnome/Makefile:1.122 pkgsrc/devel/libgnome/Makefile:1.123
--- pkgsrc/devel/libgnome/Makefile:1.122        Sat Jan 18 21:48:06 2020
+++ pkgsrc/devel/libgnome/Makefile      Mon Jan 20 21:14:14 2020
@@ -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_applicatio
 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

Index: pkgsrc/devel/libgnome/buildlink3.mk
diff -u pkgsrc/devel/libgnome/buildlink3.mk:1.63 pkgsrc/devel/libgnome/buildlink3.mk:1.64
--- pkgsrc/devel/libgnome/buildlink3.mk:1.63    Sat Jan 18 21:48:06 2020
+++ pkgsrc/devel/libgnome/buildlink3.mk Mon Jan 20 21:14:14 2020
@@ -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+=       libgnom
 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"