3 files changed, 41 insertions, 11 deletions
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index 34f8fb4d0db..2b60a42ce00 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,23 +1,16 @@
-# $NetBSD: Makefile,v 1.22 2003/05/09 08:02:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/06/23 07:14:47 mrg Exp $
 #
 
-DISTNAME=		Gtk-Perl-0.7008
-PKGNAME=		p5-gtk-0.7008
+.include "Makefile.common"
+
+PKGNAME=		p5-gtk-${GTKPERL_VERSION}
 PKGREVISION=		1
 SVR4_PKGNAME=		p5gtk
 WRKSRC=			${WRKDIR}/${DISTNAME}/Gtk
-CATEGORIES=		x11 perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Gtk/} \
-			ftp://ftp.gtk.org/pub/gtk/perl/
 
 MAINTAINER=		root@garbled.net
 COMMENT=		Perl bindings for GTK+
 
-BUILD_DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-BUILD_DEPENDS+=		p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer
-
-USE_BUILDLINK2=		YES
-USE_X11=		YES
 MAKE_PARAMS=		INSTALLMAN3DIR=${PREFIX}/man/man3
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Gtk/.packlist
 
diff --git a/x11/p5-gtk/Makefile.common b/x11/p5-gtk/Makefile.common
new file mode 100644
index 00000000000..15c901c85f7
--- /dev/null
+++ b/x11/p5-gtk/Makefile.common
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.common,v 1.1 2003/06/23 07:14:48 mrg Exp $
+#
+# common things for p5-gtk based packages
+
+GTKPERL_VERSION=	0.7008
+DISTNAME=		Gtk-Perl-${GTKPERL_VERSION}
+
+CATEGORIES=		x11 perl5
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Gtk/} \
+			ftp://ftp.gtk.org/pub/gtk/perl/
+
+BUILD_DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+BUILD_DEPENDS+=		p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer
+
+USE_BUILDLINK2=		YES
+USE_X11=		YES
diff --git a/x11/p5-gtk/Makefile.subpackage b/x11/p5-gtk/Makefile.subpackage
new file mode 100644
index 00000000000..8ddab29bc62
--- /dev/null
+++ b/x11/p5-gtk/Makefile.subpackage
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.subpackage,v 1.1 2003/06/23 07:14:48 mrg Exp $
+#
+# makefile fragment for p5-gtk sub-packages.  you need to
+# set SUBPACKAGE before including this.
+
+GTKDIR=		${WRKDIR}/${DISTNAME}/Gtk
+WRKSRC=		${WRKDIR}/${DISTNAME}/${SUBPACKAGE}
+
+PATCHDIR=	${.CURDIR}/../../x11/p5-gtk/patches
+DISTINFO_FILE=	${.CURDIR}/../../x11/p5-gtk/distinfo
+
+.include "../../lang/perl5/buildlink2.mk"
+
+pre-configure:
+	cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} \
+			${MAKE_PROGRAM} -f ${MAKEFILE} ${ALL_TARGET}
+
+.include "../../lang/perl5/module.mk"
+.include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"