[pkgsrc/trunk]: pkgsrc/graphics/compface Add DESTDIR support.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a3c4a31878d
branches:  trunk
changeset: 560363:2a3c4a31878d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jun 11 10:04:27 2009 +0000

description:
Add DESTDIR support.

diffstat:

 graphics/compface/Makefile         |   5 ++-
 graphics/compface/distinfo         |   4 +-
 graphics/compface/patches/patch-aa |  46 ++++++++++++++++++++++++++++---------
 3 files changed, 40 insertions(+), 15 deletions(-)

diffs (93 lines):

diff -r da9d1e9ba405 -r 2a3c4a31878d graphics/compface/Makefile
--- a/graphics/compface/Makefile        Thu Jun 11 08:13:05 2009 +0000
+++ b/graphics/compface/Makefile        Thu Jun 11 10:04:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/02/17 13:02:20 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/06/11 10:04:27 tnn Exp $
 
 DISTNAME=      compface-1.5.2
 PKGREVISION=   1
@@ -10,6 +10,7 @@
 COMMENT=       48x48x1 image compression and decompression (X-face utility)
 
 CONFLICTS=     faces-[0-9]*
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=            gmake perl:run
 GNU_CONFIGURE=         yes
@@ -24,6 +25,6 @@
 SUBST_SED.perlpath+=   -e 's|/usr/bin/perl|${PERL5}|g'
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/xbm2xface.pl ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/xbm2xface.pl ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r da9d1e9ba405 -r 2a3c4a31878d graphics/compface/distinfo
--- a/graphics/compface/distinfo        Thu Jun 11 08:13:05 2009 +0000
+++ b/graphics/compface/distinfo        Thu Jun 11 10:04:27 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/03/27 12:34:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2009/06/11 10:04:27 tnn Exp $
 
 SHA1 (compface-1.5.2.tar.gz) = 72dad8774b3301a1562bdbd5b3c5536ebf86a03d
 RMD160 (compface-1.5.2.tar.gz) = 17174e8c263ae3984dd74fa7e93f8835773cd742
 Size (compface-1.5.2.tar.gz) = 46970 bytes
-SHA1 (patch-aa) = 3ed1a6cb88914f199b106fa31ee3e5fcbb2aff4b
+SHA1 (patch-aa) = 635def93dbf71e26043c460ab3bf699bc3b35916
diff -r da9d1e9ba405 -r 2a3c4a31878d graphics/compface/patches/patch-aa
--- a/graphics/compface/patches/patch-aa        Thu Jun 11 08:13:05 2009 +0000
+++ b/graphics/compface/patches/patch-aa        Thu Jun 11 10:04:27 2009 +0000
@@ -1,17 +1,41 @@
-$NetBSD: patch-aa,v 1.4 2007/03/27 12:34:11 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2009/06/11 10:04:27 tnn Exp $
 
---- Makefile.in.orig   2005-10-04 08:59:49.000000000 -0400
+--- Makefile.in.orig   2005-10-04 14:59:49.000000000 +0200
 +++ Makefile.in
-@@ -74,7 +74,11 @@ dist: $(DISTFILES)
+@@ -74,19 +74,23 @@ dist: $(DISTFILES)
                $(RM) -rf `cat .fname` .fname
  
  install:      $(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
 -              $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
-+              $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
-+              $(BSD_INSTALL_LIB_DIR) $(LIBDIR)
-+              $(BSD_INSTALL_MAN_DIR) $(MAN1DIR)
-+              $(BSD_INSTALL_MAN_DIR) $(MAN3DIR)
-+              $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)
-               $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
-               -chmod 0755 $(EXECUTABLE)
-               -strip $(EXECUTABLE)
+-              $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
+-              -chmod 0755 $(EXECUTABLE)
+-              -strip $(EXECUTABLE)
+-              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+-              -chmod 0755 $(UNEXECUTABLE)
+-              -strip $(UNEXECUTABLE)
+-              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+-              cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+-              $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+-              cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
+-              for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+-              $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++              $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
++              $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR)
++              $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MAN1DIR)
++              $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MAN3DIR)
++              $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCLUDEDIR)
++              $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE) 
++              -chmod 0755 $(DESTDIR)$(EXECUTABLE)
++              -strip $(DESTDIR)$(EXECUTABLE)
++              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(DESTDIR)$(UNEXECUTABLE)
++              -chmod 0755 $(DESTDIR)$(UNEXECUTABLE)
++              -strip $(DESTDIR)$(UNEXECUTABLE)
++              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
++              cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
++              $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
++              cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
++              for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++              $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(DESTDIR)$(LIBRARY)
+ 
+ shar :
+               shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh