From 70617752b07ce3a6034e7f7c45a518a92ec47214 Mon Sep 17 00:00:00 2001
From: vs <vs@FreeBSD.org>
Date: Tue, 19 Apr 2005 21:38:03 +0000
Subject: - Use PLIST_FILES/PORTDOCS - Minimize Makefile-patch

---
 devel/astyle/Makefile       | 4 ++++
 devel/astyle/files/patch-ad | 6 +-----
 devel/astyle/pkg-plist      | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 devel/astyle/pkg-plist

diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 145eb4349e30..dd3a3cfc1b88 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -20,6 +20,10 @@ EXTRACT_BEFORE_ARGS=	-q -aa
 EXTRACT_AFTER_ARGS=	-d ${DISTNAME}
 CFLAGS+=	"-fpermissive"
 ALL_TARGET=	astyle
+MAKE_ARGS=	CPPFLAGS="${CXXFLAGS}"
+
+PLIST_FILES=	bin/astyle
+PORTDOCS=	astyle.html astyle_release_notes.html license.html
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/astyle/files/patch-ad b/devel/astyle/files/patch-ad
index 10d223340b7c..b73ad2379c1a 100644
--- a/devel/astyle/files/patch-ad
+++ b/devel/astyle/files/patch-ad
@@ -1,10 +1,6 @@
 --- Makefile.orig	Fri Feb 11 13:02:00 2000
 +++ Makefile	Sat Oct 26 21:35:38 2002
-@@ -1,13 +1,13 @@
- # "Artistic Style" Makefile
- 
--CPPFLAGS = -Wall -Wno-sign-compare -O2
-+CPPFLAGS = ${CXXFLAGS}
+@@ -1,10 +1,10 @@
  OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
  
  astyle: $(OBJS)
diff --git a/devel/astyle/pkg-plist b/devel/astyle/pkg-plist
deleted file mode 100644
index 9ba47ad20fc9..000000000000
--- a/devel/astyle/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/astyle
-%%PORTDOCS%%share/doc/astyle/astyle.html
-%%PORTDOCS%%share/doc/astyle/astyle_release_notes.html
-%%PORTDOCS%%share/doc/astyle/license.html
-%%PORTDOCS%%@dirrm share/doc/astyle
-- 
cgit