Thu May 6 09:36:28 2010 UTC ()
Work around the inconsistent behavior "cp -r" when coping symbolic link.
Closes PR 41142.


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

--- pkgsrc/textproc/p5-SGMLS/distinfo 2008/01/13 18:11:27 1.3
+++ pkgsrc/textproc/p5-SGMLS/distinfo 2010/05/06 09:36:28 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2008/01/13 18:11:27 heinz Exp $ 1$NetBSD: distinfo,v 1.4 2010/05/06 09:36:28 sbd 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) = 158d93134acb86bf1c5f97eae8db95677ce6b63f 6SHA1 (patch-aa) = 1a7dedb1e66f528cab6f47a9ebfb7a42515091d0
cvs diff -r1.3 -r1.4 pkgsrc/textproc/p5-SGMLS/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/p5-SGMLS/patches/patch-aa 2008/01/13 18:11:28 1.3
+++ pkgsrc/textproc/p5-SGMLS/patches/patch-aa 2010/05/06 09:36:28 1.4
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1$NetBSD: patch-aa,v 1.3 2008/01/13 18:11:28 heinz Exp $ 1$NetBSD: patch-aa,v 1.4 2010/05/06 09:36:28 sbd Exp $
2 2
3 - make package build with pkgsrc. 3 - make package build with pkgsrc.
4 - DESTDIR fixes 4 - DESTDIR fixes
 5 - work around for "cp -r" behavior inconsistencies.
5 6
6--- Makefile.orig 1995-12-05 13:26:11.000000000 +0100 7
 8--- Makefile.orig 1995-12-05 12:26:11.000000000 +0000
7+++ Makefile 9+++ Makefile
8@@ -13,13 +13,13 @@ DIST = SGMLSpm-1.03ii.tar.gz 10@@ -13,13 +13,13 @@ DIST = SGMLSpm-1.03ii.tar.gz
9 # 11 #
10  12
11 # Where is the binary for perl5 located on your system? 13 # Where is the binary for perl5 located on your system?
12-PERL = /usr/bin/perl 14-PERL = /usr/bin/perl
13+PERL = ${PERL5} 15+PERL = ${PERL5}
14  16
15 # Where do you want the sgmlspl executable script to be installed? 17 # Where do you want the sgmlspl executable script to be installed?
16-BINDIR = /usr/local/bin 18-BINDIR = /usr/local/bin
17+BINDIR = ${PREFIX}/bin 19+BINDIR = ${PREFIX}/bin
18  20
19 # Where do you put local perl5 libaries? 21 # Where do you put local perl5 libaries?
20-PERL5DIR = /usr/local/lib/perl5 22-PERL5DIR = /usr/local/lib/perl5
21+PERL5DIR = ${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB} 23+PERL5DIR = ${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}
22 MODULEDIR = ${PERL5DIR}/SGMLS 24 MODULEDIR = ${PERL5DIR}/SGMLS
23  25
24 # Where do you want to put sgmlspl specifications? 26 # Where do you want to put sgmlspl specifications?
25@@ -29,61 +29,66 @@ SPECDIR = ${PERL5DIR} 27@@ -29,61 +29,68 @@ SPECDIR = ${PERL5DIR}
26 # do you intend to put it? 'make html' will create two 28 # do you intend to put it? 'make html' will create two
27 # subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place 29 # subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place
28 # its files there. 30 # its files there.
29-HTMLDIR = /usr/local/lib/www/docs 31-HTMLDIR = /usr/local/lib/www/docs
30+HTMLDIR = ${PREFIX}/share/doc/p5-SGMLS 32+HTMLDIR = ${PREFIX}/share/doc/p5-SGMLS
31  33
32  34
33 # 35 #
34 # End of user options. 36 # End of user options.
35 # 37 #
36  38
37-HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/ 39-HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/
38+HTML_SOURCES = DOC/HTML/SGMLSpm DOC/HTML/sgmlspl 40+HTML_SOURCES = DOC/HTML/SGMLSpm DOC/HTML/sgmlspl
@@ -110,18 +112,20 @@ $NetBSD: patch-aa,v 1.3 2008/01/13 18:11 @@ -110,18 +112,20 @@ $NetBSD: patch-aa,v 1.3 2008/01/13 18:11
110  112
111 install_html: ${HTML_SOURCES} 113 install_html: ${HTML_SOURCES}
112 cd DOC; make html 114 cd DOC; make html
113- rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl 115- rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
114- cp -r ${HTML_SOURCES} ${HTMLDIR} 116- cp -r ${HTML_SOURCES} ${HTMLDIR}
115- chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl 117- chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
116- chmod a+r ${HTMLDIR}/SGMLSpm/* ${HTMLDIR}/sgmlspl/* 118- chmod a+r ${HTMLDIR}/SGMLSpm/* ${HTMLDIR}/sgmlspl/*
117+ if [ ! -d ${DESTDIR}${HTMLDIR} ]; then\ 119+ if [ ! -d ${DESTDIR}${HTMLDIR} ]; then\
118+ mkdir ${DESTDIR}${HTMLDIR}; \ 120+ mkdir ${DESTDIR}${HTMLDIR}; \
119+ chmod a+x ${DESTDIR}${HTMLDIR}; \ 121+ chmod a+x ${DESTDIR}${HTMLDIR}; \
120+ fi 122+ fi
121+ rm -rf ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl 123+ rm -rf ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
122+ cp -r ${HTML_SOURCES} ${DESTDIR}${HTMLDIR} 124+ cp -r ${HTML_SOURCES} ${DESTDIR}${HTMLDIR}
 125+ rm -f ${DESTDIR}${HTMLDIR}/SGMLSpm/sample.pl
 126+ cp DOC/sample.pl ${DESTDIR}${HTMLDIR}/SGMLSpm
123+ chmod a+x,a+r ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl 127+ chmod a+x,a+r ${DESTDIR}${HTMLDIR}/SGMLSpm ${DESTDIR}${HTMLDIR}/sgmlspl
124+ chmod a+r ${DESTDIR}${HTMLDIR}/SGMLSpm/* ${DESTDIR}${HTMLDIR}/sgmlspl/* 128+ chmod a+r ${DESTDIR}${HTMLDIR}/SGMLSpm/* ${DESTDIR}${HTMLDIR}/sgmlspl/*
125  129
126 docs: 130 docs:
127 cd DOC; make all 131 cd DOC; make all