Buildlinkify gnome-- by applying the patches provided by Eric Gillespie,

Jr., in PR pkg/14205.

2 files changed, 61 insertions, 6 deletions

diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 776b7e60bbb..469bab4af35 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:55 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/24 21:23:57 rh Exp $
 #
 
 DISTNAME=	gnomemm-1.1.19
-PKGNAME=	gnome---1.1.19
+PKGNAME=	${DISTNAME:S/mm/--/}
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://prdownloads.sourceforge.net/gtkmm/
@@ -11,16 +11,15 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ binding for the GNOME libraries
 
-DEPENDS+=	gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
-DEPENDS+=	libsigc++>=1.0.1:../../devel/libsigc++
-DEPENDS+=	gtk-->=1.2.5:../../x11/gtk--
 BUILD_DEPENDS+=	perl-*:../../lang/perl5
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig/scripts
 USE_X11BASE=	yes
+USE_BUILDLINK_ONLY=	YES
+REPLACE_BUILDLINK=	gnomemmConf.sh
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig/scripts
 
 EVAL_PREFIX+=	PERLBASE=perl
 
@@ -28,4 +27,8 @@ post-patch:
 	(cd ${WRKSRC}/docgen && ${CP} pce2 pce2.tmp && \
 	 ${SED} "s|XXXPERLBASEXXX|${PERLBASE}|" <pce2.tmp >pce2)
 
+.include "../../devel/libsigc++/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
+.include "../../x11/gtk--/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome--/buildlink.mk b/x11/gnome--/buildlink.mk
new file mode 100644
index 00000000000..318f5063b94
--- /dev/null
+++ b/x11/gnome--/buildlink.mk
@@ -0,0 +1,52 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/03/24 21:23:57 rh Exp $
+#
+# This Makefile fragment is included by packages that use gnome--.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gnome-- to the dependency
+#     pattern for the version of gnome-- desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GNOMEMM_BUILDLINK_MK)
+GNOMEMM_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.1.19
+DEPENDS+=	${BUILDLINK_DEPENDS.gnomemm}:../../x11/gnome--
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
+BUILDLINK_PREFIX.gnomemm_DEFAULTS=	${X11PREFIX}
+BUILDLINK_FILES.gnomemm=		include/gnome--/private/*
+BUILDLINK_FILES.gnomemm+=		include/gnome--/*
+BUILDLINK_FILES.gnomemm+=		include/gnome--.h
+BUILDLINK_FILES.gnomemm+=		lib/libgnomemm-1.1.*
+BUILDLINK_FILES.gnomemm+=		lib/libgnomemm.*
+
+.include "../../devel/libsigc++/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
+.include "../../x11/gtk--/buildlink.mk"
+
+BUILDLINK_TARGETS.gnomemm=	gnomemm-buildlink
+BUILDLINK_TARGETS.gnomemm+=	gnomemm-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnomemm}
+
+BUILDLINK_CONFIG.gnomemm=	${BUILDLINK_PREFIX.gnomemm}/lib/gnomemmConf.sh
+BUILDLINK_CONFIG_WRAPPER.gnomemm=	${BUILDLINK_DIR}/lib/gnomemmConf.sh
+
+.if defined(USE_CONFIG_WRAPPER)
+GNOMEMM_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gnomemm}
+CONFIGURE_ENV+=			GNOMEMM_CONFIG="${GNOMEMM_CONFIG}"
+MAKE_ENV+=			GNOMEMM_CONFIG="${GNOMEMM_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gnomemm}
+gnomemm-buildlink: _BUILDLINK_USE
+gnomemm-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GNOMEMM_BUILDLINK_MK