[pkgsrc/trunk]: pkgsrc/devel/astyle Don't rename makefile to Makefile, use it...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9822d6ffe624
branches:  trunk
changeset: 535781:9822d6ffe624
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 28 19:06:00 2007 +0000

description:
Don't rename makefile to Makefile, use it directly. Add DESTDIR support.

diffstat:

 devel/astyle/Makefile         |  13 +++++++------
 devel/astyle/distinfo         |   4 ++--
 devel/astyle/patches/patch-aa |   8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diffs (73 lines):

diff -r dcaac35cdb62 -r 9822d6ffe624 devel/astyle/Makefile
--- a/devel/astyle/Makefile     Wed Nov 28 18:44:02 2007 +0000
+++ b/devel/astyle/Makefile     Wed Nov 28 19:06:00 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/06 21:38:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/11/28 19:06:00 joerg Exp $
 #
 
 DISTNAME=      astyle_1.13.6.1
@@ -12,7 +12,12 @@
 HOMEPAGE=      http://astyle.sourceforge.net/
 COMMENT=       Reindenter and reformatter of C++, C and Java source code
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+MAKE_FILE=     makefile
+
 HTMLDIR=       ${PREFIX}/share/doc/html/astyle
+INSTALLATION_DIRS=     bin ${HTMLDIR}
 
 USE_LANGUAGES= c++
 
@@ -22,12 +27,8 @@
 CFLAGS+=       -DASTYLE_GCC2
 .endif
 
-post-extract:
-       ${MV} -f ${WRKSRC}/makefile ${WRKSRC}/Makefile
-
 post-install:
-       ${INSTALL_DATA_DIR} ${HTMLDIR}
        cd ${WRKSRC} && ${INSTALL_DATA} astyle.html \
-               astyle_release_notes.html license.html ${HTMLDIR}
+               astyle_release_notes.html license.html ${DESTDIR}${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r dcaac35cdb62 -r 9822d6ffe624 devel/astyle/distinfo
--- a/devel/astyle/distinfo     Wed Nov 28 18:44:02 2007 +0000
+++ b/devel/astyle/distinfo     Wed Nov 28 19:06:00 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/01/02 18:05:11 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/11/28 19:06:01 joerg Exp $
 
 SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675
 RMD160 (astyle_1.13.6.1.zip) = 74030324515be84e0e7499edc2503d0e549673ba
 Size (astyle_1.13.6.1.zip) = 61422 bytes
-SHA1 (patch-aa) = 1bb6cb72145c52e548336d4d90020fa982d049e1
+SHA1 (patch-aa) = 3e8adb7b979188f9828b3ae22d8037008975fb5b
 SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7
 SHA1 (patch-ac) = d143f2cd5ef3d15317d8dbe01be98f3a9a862ec6
diff -r dcaac35cdb62 -r 9822d6ffe624 devel/astyle/patches/patch-aa
--- a/devel/astyle/patches/patch-aa     Wed Nov 28 18:44:02 2007 +0000
+++ b/devel/astyle/patches/patch-aa     Wed Nov 28 19:06:00 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2004/06/12 02:30:35 grant Exp $
+$NetBSD: patch-aa,v 1.4 2007/11/28 19:06:01 joerg Exp $
 
---- Makefile.orig      2000-02-11 12:02:10.000000000 +1100
-+++ Makefile
+--- makefile.orig      2000-02-11 12:02:10.000000000 +1100
++++ makefile
 @@ -1,14 +1,19 @@
  # "Artistic Style" Makefile
  
@@ -13,7 +13,7 @@
 +all: astyle
 +
 +install:
-+      install -s -c astyle ${LOCALBASE}/bin/
++      install -s -c astyle ${DESTDIR}${PREFIX}/bin
  
  astyle: $(OBJS)
 -      g++ $(CPPFLAGS) -o astyle  $(OBJS)