- Added support for installation to DESTDIR.

- Switched to the common scheme for MASTER_SITES and HOMEPAGE (ie,
  MASTER_SITE_PERL_CPAN and search.cpan.org/dist).
- No C compiler needed.

3 files changed, 95 insertions, 20 deletions

diff --git a/textproc/p5-SGMLS/Makefile b/textproc/p5-SGMLS/Makefile
index 29b5ff8cac2..3ea52c466bc 100644
--- a/textproc/p5-SGMLS/Makefile
+++ b/textproc/p5-SGMLS/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2007/01/15 05:32:40 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/13 18:11:25 heinz Exp $
 #
 
 DISTNAME=		SGMLSpm-1.03ii
 PKGNAME=		p5-SGMLS-1.03.2
 CATEGORIES=		textproc
-MASTER_SITES=		http://search.cpan.org/CPAN/authors/id/D/DM/DMEGG/
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../by-authors/id/D/DM/DMEGG/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/~dmegg/SGMLSpm-1.03ii/
+HOMEPAGE=		http://search.cpan.org/dist/SGMLSpm-1.03ii/
 COMMENT=		Class for postprocessing the output from the sgmls and nsgmls parsers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LANGUAGES=		# empty
+
 INSTALL_TARGET=		install install_html
 WRKSRC=			${WRKDIR}/SGMLSpm
 MAKE_ENV+=		PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q}
@@ -18,5 +22,7 @@ PLIST_SUBST+=		PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q}
 
 PERL5_USE_PACKLIST=	no
 
+INSTALLATION_DIRS+=	bin
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-SGMLS/distinfo b/textproc/p5-SGMLS/distinfo
index 1e5fe360d6b..c9cc8f68880 100644
--- a/textproc/p5-SGMLS/distinfo
+++ b/textproc/p5-SGMLS/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/01/22 20:59:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2008/01/13 18:11:27 heinz Exp $
 
 SHA1 (SGMLSpm-1.03ii.tar.gz) = 1ff07104fd70a1d1bf05f3523b94413049c1fc95
 RMD160 (SGMLSpm-1.03ii.tar.gz) = 919963150640d4c1a2a52439cd0d985c52c71bb3
 Size (SGMLSpm-1.03ii.tar.gz) = 93250 bytes
-SHA1 (patch-aa) = a1d70030bda6e904204aab70f39a97b857a02d25
+SHA1 (patch-aa) = 158d93134acb86bf1c5f97eae8db95677ce6b63f
diff --git a/textproc/p5-SGMLS/patches/patch-aa b/textproc/p5-SGMLS/patches/patch-aa
index 4d18ad97946..05d0f92e6b1 100644
--- a/textproc/p5-SGMLS/patches/patch-aa
+++ b/textproc/p5-SGMLS/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2006/01/22 20:59:32 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2008/01/13 18:11:28 heinz Exp $
 
---- Makefile.orig	1995-12-05 12:26:11.000000000 +0000
+  - make package build with pkgsrc.
+  - DESTDIR fixes
+
+--- Makefile.orig	1995-12-05 13:26:11.000000000 +0100
 +++ Makefile
 @@ -13,13 +13,13 @@ DIST = SGMLSpm-1.03ii.tar.gz
  #
@@ -19,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/22 20:59:32 wiz Exp $
  MODULEDIR = ${PERL5DIR}/SGMLS
  
  # Where do you want to put sgmlspl specifications?
-@@ -29,14 +29,14 @@ SPECDIR = ${PERL5DIR}
+@@ -29,61 +29,66 @@ SPECDIR = ${PERL5DIR}
  # do you intend to put it?  'make html' will create two
  # subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place
  # its files there.
@@ -34,25 +37,91 @@ $NetBSD: patch-aa,v 1.2 2006/01/22 20:59:32 wiz Exp $
 -HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/
 +HTML_SOURCES = DOC/HTML/SGMLSpm DOC/HTML/sgmlspl
  
- FILES =	${BINDIR}/sgmlspl \
- 	${PERL5DIR}/SGMLS.pm \
-@@ -44,7 +44,7 @@ FILES =	${BINDIR}/sgmlspl \
- 	${MODULEDIR}/Refs.pm \
- 	${SPECDIR}/skel.pl
+-FILES =	${BINDIR}/sgmlspl \
+-	${PERL5DIR}/SGMLS.pm \
+-	${MODULEDIR}/Output.pm \
+-	${MODULEDIR}/Refs.pm \
+-	${SPECDIR}/skel.pl
++FILES =	${DESTDIR}${BINDIR}/sgmlspl \
++	${DESTDIR}${PERL5DIR}/SGMLS.pm \
++	${DESTDIR}${MODULEDIR}/Output.pm \
++	${DESTDIR}${MODULEDIR}/Refs.pm \
++	${DESTDIR}${SPECDIR}/skel.pl
  
 -all: install docs
 +all: docs
  
  install: install_system # install_html
  
-@@ -80,6 +80,10 @@ ${SPECDIR}/skel.pl: skel.pl
+-install_system: ${MODULEDIR} ${FILES}
++install_system: ${DESTDIR}${MODULEDIR} ${FILES}
+ 
+ dist: ${DIST}
+ 
+-${BINDIR}/sgmlspl: sgmlspl.pl
+-	sed -e 's!/usr/bin/perl!${PERL}!' sgmlspl.pl > ${BINDIR}/sgmlspl
+-	chmod a+x,a+r ${BINDIR}/sgmlspl
+-
+-${PERL5DIR}/SGMLS.pm: SGMLS.pm
+-	cp SGMLS.pm ${PERL5DIR}/SGMLS.pm
+-	chmod a+r ${PERL5DIR}/SGMLS.pm
+-
+-${MODULEDIR}:
+-	if [ ! -d ${MODULEDIR} ]; then\
+-	  mkdir ${MODULEDIR}; \
+-	  chmod a+x ${MODULEDIR}; \
++${DESTDIR}${BINDIR}/sgmlspl: sgmlspl.pl
++	sed -e 's!/usr/bin/perl!${PERL}!' sgmlspl.pl > \
++		${DESTDIR}${BINDIR}/sgmlspl
++	chmod a+x,a+r ${DESTDIR}${BINDIR}/sgmlspl
++
++${DESTDIR}${PERL5DIR}/SGMLS.pm: SGMLS.pm
++	cp SGMLS.pm ${DESTDIR}${PERL5DIR}/SGMLS.pm
++	chmod a+r ${DESTDIR}${PERL5DIR}/SGMLS.pm
++
++${DESTDIR}${MODULEDIR}:
++	if [ ! -d ${DESTDIR}${MODULEDIR} ]; then\
++	  mkdir ${DESTDIR}${MODULEDIR}; \
++	  chmod a+x ${DESTDIR}${MODULEDIR}; \
+ 	fi
+ 
+-${MODULEDIR}/Output.pm: Output.pm
+-	cp Output.pm ${MODULEDIR}/Output.pm
+-	chmod a+r ${MODULEDIR}/Output.pm
+-
+-${MODULEDIR}/Refs.pm: Refs.pm
+-	cp Refs.pm ${MODULEDIR}/Refs.pm
+-	chmod a+r ${MODULEDIR}/Refs.pm
+-
+-${SPECDIR}/skel.pl: skel.pl
+-	cp skel.pl ${SPECDIR}/skel.pl
+-	chmod a+r ${SPECDIR}/skel.pl
++${DESTDIR}${MODULEDIR}/Output.pm: Output.pm
++	cp Output.pm ${DESTDIR}${MODULEDIR}/Output.pm
++	chmod a+r ${DESTDIR}${MODULEDIR}/Output.pm
++
++${DESTDIR}${MODULEDIR}/Refs.pm: Refs.pm
++	cp Refs.pm ${DESTDIR}${MODULEDIR}/Refs.pm
++	chmod a+r ${DESTDIR}${MODULEDIR}/Refs.pm
++
++${DESTDIR}${SPECDIR}/skel.pl: skel.pl
++	cp skel.pl ${DESTDIR}${SPECDIR}/skel.pl
++	chmod a+r ${DESTDIR}${SPECDIR}/skel.pl
  
  install_html: ${HTML_SOURCES}
  	cd DOC; make html
-+	if [ ! -d ${HTMLDIR} ]; then\
-+	  mkdir ${HTMLDIR}; \
-+	  chmod a+x ${HTMLDIR}; \
+-	rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
+-	cp -r ${HTML_SOURCES} ${HTMLDIR}
+-	chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
+-	chmod a+r ${HTMLDIR}/SGMLSpm/* ${HTMLDIR}/sgmlspl/*
++	if [ ! -d ${DESTDIR}${HTMLDIR} ]; then\
++	  mkdir ${DESTDIR}${HTMLDIR}; \
++	  chmod a+x ${DESTDIR}${HTMLDIR}; \
 +	fi
- 	rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
- 	cp -r ${HTML_SOURCES} ${HTMLDIR}
- 	chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
++	rm -rf ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
++	cp -r ${HTML_SOURCES} ${DESTDIR}${HTMLDIR}
++	chmod a+x,a+r ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
++	chmod a+r ${DESTDIR}${HTMLDIR}/SGMLSpm/* ${DESTDIR}${HTMLDIR}/sgmlspl/*
+ 
+ docs:
+ 	cd DOC; make all