Sun Jan 13 18:11:28 2008 UTC ()
- 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.


(heinz)
diff -r1.3 -r1.4 pkgsrc/textproc/p5-SGMLS/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/p5-SGMLS/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/p5-SGMLS/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/textproc/p5-SGMLS/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/p5-SGMLS/Makefile 2007/01/15 05:32:40 1.3
+++ pkgsrc/textproc/p5-SGMLS/Makefile 2008/01/13 18:11:25 1.4
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1# $NetBSD: Makefile,v 1.3 2007/01/15 05:32:40 rillig Exp $ 1# $NetBSD: Makefile,v 1.4 2008/01/13 18:11:25 heinz Exp $
2# 2#
3 3
4DISTNAME= SGMLSpm-1.03ii 4DISTNAME= SGMLSpm-1.03ii
5PKGNAME= p5-SGMLS-1.03.2 5PKGNAME= p5-SGMLS-1.03.2
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://search.cpan.org/CPAN/authors/id/D/DM/DMEGG/ 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/D/DM/DMEGG/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://search.cpan.org/~dmegg/SGMLSpm-1.03ii/ 10HOMEPAGE= http://search.cpan.org/dist/SGMLSpm-1.03ii/
11COMMENT= Class for postprocessing the output from the sgmls and nsgmls parsers 11COMMENT= Class for postprocessing the output from the sgmls and nsgmls parsers
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
 15USE_LANGUAGES= # empty
 16
13INSTALL_TARGET= install install_html 17INSTALL_TARGET= install install_html
14WRKSRC= ${WRKDIR}/SGMLSpm 18WRKSRC= ${WRKDIR}/SGMLSpm
15MAKE_ENV+= PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q} 19MAKE_ENV+= PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q}
16MAKE_ENV+= PERL5=${PERL5:Q} 20MAKE_ENV+= PERL5=${PERL5:Q}
17PLIST_SUBST+= PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q} 21PLIST_SUBST+= PERL5_SUB_INSTALLVENDORLIB=${PERL5_SUB_INSTALLVENDORLIB:Q}
18 22
19PERL5_USE_PACKLIST= no 23PERL5_USE_PACKLIST= no
20 24
 25INSTALLATION_DIRS+= bin
 26
21.include "../../lang/perl5/module.mk" 27.include "../../lang/perl5/module.mk"
22.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/p5-SGMLS/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/p5-SGMLS/distinfo 2006/01/22 20:59:32 1.2
+++ pkgsrc/textproc/p5-SGMLS/distinfo 2008/01/13 18:11:27 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2006/01/22 20:59:32 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2008/01/13 18:11:27 heinz Exp $
2 2
3SHA1 (SGMLSpm-1.03ii.tar.gz) = 1ff07104fd70a1d1bf05f3523b94413049c1fc95 3SHA1 (SGMLSpm-1.03ii.tar.gz) = 1ff07104fd70a1d1bf05f3523b94413049c1fc95
4RMD160 (SGMLSpm-1.03ii.tar.gz) = 919963150640d4c1a2a52439cd0d985c52c71bb3 4RMD160 (SGMLSpm-1.03ii.tar.gz) = 919963150640d4c1a2a52439cd0d985c52c71bb3
5Size (SGMLSpm-1.03ii.tar.gz) = 93250 bytes 5Size (SGMLSpm-1.03ii.tar.gz) = 93250 bytes
6SHA1 (patch-aa) = a1d70030bda6e904204aab70f39a97b857a02d25 6SHA1 (patch-aa) = 158d93134acb86bf1c5f97eae8db95677ce6b63f
cvs diff -r1.2 -r1.3 pkgsrc/textproc/p5-SGMLS/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/p5-SGMLS/patches/patch-aa 2006/01/22 20:59:32 1.2
+++ pkgsrc/textproc/p5-SGMLS/patches/patch-aa 2008/01/13 18:11:28 1.3
@@ -1,58 +1,127 @@ @@ -1,58 +1,127 @@
1$NetBSD: patch-aa,v 1.2 2006/01/22 20:59:32 wiz Exp $ 1$NetBSD: patch-aa,v 1.3 2008/01/13 18:11:28 heinz Exp $
2 2
3--- Makefile.orig 1995-12-05 12:26:11.000000000 +0000 3 - make package build with pkgsrc.
 4 - DESTDIR fixes
 5
 6--- Makefile.orig 1995-12-05 13:26:11.000000000 +0100
4+++ Makefile 7+++ Makefile
5@@ -13,13 +13,13 @@ DIST = SGMLSpm-1.03ii.tar.gz 8@@ -13,13 +13,13 @@ DIST = SGMLSpm-1.03ii.tar.gz
6 # 9 #
7  10
8 # Where is the binary for perl5 located on your system? 11 # Where is the binary for perl5 located on your system?
9-PERL = /usr/bin/perl 12-PERL = /usr/bin/perl
10+PERL = ${PERL5} 13+PERL = ${PERL5}
11  14
12 # Where do you want the sgmlspl executable script to be installed? 15 # Where do you want the sgmlspl executable script to be installed?
13-BINDIR = /usr/local/bin 16-BINDIR = /usr/local/bin
14+BINDIR = ${PREFIX}/bin 17+BINDIR = ${PREFIX}/bin
15  18
16 # Where do you put local perl5 libaries? 19 # Where do you put local perl5 libaries?
17-PERL5DIR = /usr/local/lib/perl5 20-PERL5DIR = /usr/local/lib/perl5
18+PERL5DIR = ${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB} 21+PERL5DIR = ${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}
19 MODULEDIR = ${PERL5DIR}/SGMLS 22 MODULEDIR = ${PERL5DIR}/SGMLS
20  23
21 # Where do you want to put sgmlspl specifications? 24 # Where do you want to put sgmlspl specifications?
22@@ -29,14 +29,14 @@ SPECDIR = ${PERL5DIR} 25@@ -29,61 +29,66 @@ SPECDIR = ${PERL5DIR}
23 # do you intend to put it? 'make html' will create two 26 # do you intend to put it? 'make html' will create two
24 # subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place 27 # subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place
25 # its files there. 28 # its files there.
26-HTMLDIR = /usr/local/lib/www/docs 29-HTMLDIR = /usr/local/lib/www/docs
27+HTMLDIR = ${PREFIX}/share/doc/p5-SGMLS 30+HTMLDIR = ${PREFIX}/share/doc/p5-SGMLS
28  31
29  32
30 # 33 #
31 # End of user options. 34 # End of user options.
32 # 35 #
33  36
34-HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/ 37-HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/
35+HTML_SOURCES = DOC/HTML/SGMLSpm DOC/HTML/sgmlspl 38+HTML_SOURCES = DOC/HTML/SGMLSpm DOC/HTML/sgmlspl
36  39
37 FILES = ${BINDIR}/sgmlspl \ 40-FILES = ${BINDIR}/sgmlspl \
38 ${PERL5DIR}/SGMLS.pm \ 41- ${PERL5DIR}/SGMLS.pm \
39@@ -44,7 +44,7 @@ FILES = ${BINDIR}/sgmlspl \ 42- ${MODULEDIR}/Output.pm \
40 ${MODULEDIR}/Refs.pm \ 43- ${MODULEDIR}/Refs.pm \
41 ${SPECDIR}/skel.pl 44- ${SPECDIR}/skel.pl
 45+FILES = ${DESTDIR}${BINDIR}/sgmlspl \
 46+ ${DESTDIR}${PERL5DIR}/SGMLS.pm \
 47+ ${DESTDIR}${MODULEDIR}/Output.pm \
 48+ ${DESTDIR}${MODULEDIR}/Refs.pm \
 49+ ${DESTDIR}${SPECDIR}/skel.pl
42  50
43-all: install docs 51-all: install docs
44+all: docs 52+all: docs
45  53
46 install: install_system # install_html 54 install: install_system # install_html
47  55
48@@ -80,6 +80,10 @@ ${SPECDIR}/skel.pl: skel.pl 56-install_system: ${MODULEDIR} ${FILES}
 57+install_system: ${DESTDIR}${MODULEDIR} ${FILES}
 58
 59 dist: ${DIST}
 60
 61-${BINDIR}/sgmlspl: sgmlspl.pl
 62- sed -e 's!/usr/bin/perl!${PERL}!' sgmlspl.pl > ${BINDIR}/sgmlspl
 63- chmod a+x,a+r ${BINDIR}/sgmlspl
 64-
 65-${PERL5DIR}/SGMLS.pm: SGMLS.pm
 66- cp SGMLS.pm ${PERL5DIR}/SGMLS.pm
 67- chmod a+r ${PERL5DIR}/SGMLS.pm
 68-
 69-${MODULEDIR}:
 70- if [ ! -d ${MODULEDIR} ]; then\
 71- mkdir ${MODULEDIR}; \
 72- chmod a+x ${MODULEDIR}; \
 73+${DESTDIR}${BINDIR}/sgmlspl: sgmlspl.pl
 74+ sed -e 's!/usr/bin/perl!${PERL}!' sgmlspl.pl > \
 75+ ${DESTDIR}${BINDIR}/sgmlspl
 76+ chmod a+x,a+r ${DESTDIR}${BINDIR}/sgmlspl
 77+
 78+${DESTDIR}${PERL5DIR}/SGMLS.pm: SGMLS.pm
 79+ cp SGMLS.pm ${DESTDIR}${PERL5DIR}/SGMLS.pm
 80+ chmod a+r ${DESTDIR}${PERL5DIR}/SGMLS.pm
 81+
 82+${DESTDIR}${MODULEDIR}:
 83+ if [ ! -d ${DESTDIR}${MODULEDIR} ]; then\
 84+ mkdir ${DESTDIR}${MODULEDIR}; \
 85+ chmod a+x ${DESTDIR}${MODULEDIR}; \
 86 fi
 87
 88-${MODULEDIR}/Output.pm: Output.pm
 89- cp Output.pm ${MODULEDIR}/Output.pm
 90- chmod a+r ${MODULEDIR}/Output.pm
 91-
 92-${MODULEDIR}/Refs.pm: Refs.pm
 93- cp Refs.pm ${MODULEDIR}/Refs.pm
 94- chmod a+r ${MODULEDIR}/Refs.pm
 95-
 96-${SPECDIR}/skel.pl: skel.pl
 97- cp skel.pl ${SPECDIR}/skel.pl
 98- chmod a+r ${SPECDIR}/skel.pl
 99+${DESTDIR}${MODULEDIR}/Output.pm: Output.pm
 100+ cp Output.pm ${DESTDIR}${MODULEDIR}/Output.pm
 101+ chmod a+r ${DESTDIR}${MODULEDIR}/Output.pm
 102+
 103+${DESTDIR}${MODULEDIR}/Refs.pm: Refs.pm
 104+ cp Refs.pm ${DESTDIR}${MODULEDIR}/Refs.pm
 105+ chmod a+r ${DESTDIR}${MODULEDIR}/Refs.pm
 106+
 107+${DESTDIR}${SPECDIR}/skel.pl: skel.pl
 108+ cp skel.pl ${DESTDIR}${SPECDIR}/skel.pl
 109+ chmod a+r ${DESTDIR}${SPECDIR}/skel.pl
49  110
50 install_html: ${HTML_SOURCES} 111 install_html: ${HTML_SOURCES}
51 cd DOC; make html 112 cd DOC; make html
52+ if [ ! -d ${HTMLDIR} ]; then\ 113- rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
53+ mkdir ${HTMLDIR}; \ 114- cp -r ${HTML_SOURCES} ${HTMLDIR}
54+ chmod a+x ${HTMLDIR}; \ 115- chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
 116- chmod a+r ${HTMLDIR}/SGMLSpm/* ${HTMLDIR}/sgmlspl/*
 117+ if [ ! -d ${DESTDIR}${HTMLDIR} ]; then\
 118+ mkdir ${DESTDIR}${HTMLDIR}; \
 119+ chmod a+x ${DESTDIR}${HTMLDIR}; \
55+ fi 120+ fi
56 rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl 121+ rm -rf ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
57 cp -r ${HTML_SOURCES} ${HTMLDIR} 122+ cp -r ${HTML_SOURCES} ${DESTDIR}${HTMLDIR}
58 chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl 123+ chmod a+x,a+r ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
 124+ chmod a+r ${DESTDIR}${HTMLDIR}/SGMLSpm/* ${DESTDIR}${HTMLDIR}/sgmlspl/*
 125
 126 docs:
 127 cd DOC; make all