pkg/45339: print/acroread{,5} DESTDIR conversion botch

[kre%munnari.OZ.AU@localhost]

>Number:         45339
>Category:       pkg
>Synopsis:       print/acroread{,5} DESTDIR conversion botch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 07 22:30:00 +0000 2011
>Originator:     Robert Elz
>Release:        NetBSD 5.0  (irrelevant) (pkgsrc -current 2011-09-07)
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD jade.coe.psu.ac.th 5.1 NetBSD 5.1 (JADE-1.12-20101117) #5: Wed 
Nov 17 05:30:55 ICT 2010 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/5.1/kernels/i386/JADE i386
Architecture: i386
Machine: i386
>Description:
        The DESTDIR conversion for print/acroread and print/acroread5
        was done in a way that works only if USE_DESTDIR=yes and fails
        otherwise.

        Since these are rather obsolete packages, and since USE_DESTDIR=yes
        is the default, this is not a terribly serious problem, still
        it is trivial to fix ...

>How-To-Repeat:
        Attempt to build print/acroread or print/acroread5 with
        USE_DESTDIR=no in mk.conf (or otherwise set).

        Since I build everything to binpkgs in a pkg_comp chroot
        that lasts exactly as long as it takes to build a single
        binpkg, then is discareded, DESTDIR builds add nothing for
        me, so I have them disabled in the mk.conf that gets installed
        in the chroot.

        Note: this is not an argument against destdir, nor is it a
        suggestion that USE_DESTDIR=yes should not be the default,
        I think all of that is the right way to go - it just happens
        that it isn't needed in my environment, and just adds
        complexity (aside from the - growing smaller for sure - list
        of packages that still don't support it, a couple of which,
        those being the cvsup ones, I can't live without...)

        In any case, with USE_DESTDIR=no, print/acroread generates ...

Installing platform dependent files ... Done
 
/bin/chmod +x /usr/pkg/bin/acroread4
/usr/bin/install -c -o root -g wheel -m 444 
/usr/pkg/Acrobat4/Browsers/intellinux/nppdf.so  /usr/pkg/lib/netscape/plugins
Be sure to read the license agreement in
/usr/pkg/Acrobat4/Reader/License.pdf
=> Substituting "rmdestdir" in /usr/pkg/bin/acroread4 
/usr/pkg/Acrobat4/bin/acroread
sed: first RE may not be empty
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/print/acroread
*** Error code 1

        The behaviour of print/acroread5 is identical, other than s/4/5/
        of course (well, not all the 4's...) so I won't bother to
        include it.

>Fix:
        Apply the patch below, which will edit both acroread/Makefile
        and acroread5/Makefile (in an identical fashion).   No revbump
        needed, as this makes a difference only for non-destdir builds,
        and those simply fail without the patch.

        Apply the patch in pkgsrc/print

Index: acroread/Makefile
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/print/acroread/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- acroread/Makefile   6 Sep 2011 21:08:09 -0000       1.57
+++ acroread/Makefile   7 Sep 2011 22:06:05 -0000
@@ -80,10 +80,12 @@
        done
 .endif
 
+.if !empty(DESTDIR)
 SUBST_CLASSES+=                rmdestdir
 SUBST_STAGE.rmdestdir= post-install
 SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/bin/acroread4
 SUBST_FILES.rmdestdir+=        ${DESTDIR}${PREFIX}/Acrobat4/bin/acroread
 SUBST_SED.rmdestdir=   -e 's,${DESTDIR},,g'
+.endif
 
 .include "../../mk/bsd.pkg.mk"
Index: acroread5/Makefile
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/print/acroread5/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- acroread5/Makefile  6 Sep 2011 21:08:09 -0000       1.42
+++ acroread5/Makefile  7 Sep 2011 22:06:43 -0000
@@ -54,10 +54,12 @@
        @${ECHO_MSG} "Be sure to read the license agreement in"
        @${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt"
 
+.if !empty(DESTDIR)
 SUBST_CLASSES+=                rmdestdir
 SUBST_STAGE.rmdestdir= post-install
 SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/bin/acroread5
 SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/Acrobat5/bin/acroread
 SUBST_SED.rmdestdir=   -e 's,${DESTDIR},,g'
+.endif
 
 .include "../../mk/bsd.pkg.mk"