- replace do-extract target with proper use of EXTRACT_ variables

- change lots of whitespace to tabs
- add HOMEPAGE
- remove license type
- add @comment with RCS id to PLIST
- use better filename for patch and change it to a unified diff

mail/adcomplain/Makefile

@@ -1,29 +1,29 @@
-# $OpenBSD: Makefile,v 1.11 2000/06/04 21:40:43 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/26 20:05:18 brad Exp $
 
-DISTNAME=       adcomplain-3.49
-CATEGORIES=     mail news
-NEED_VERSION=	1.191
+DISTNAME=	adcomplain-3.49
+CATEGORIES=	mail news
+NEED_VERSION=	1.301
+MASTER_SITES=	http://www.rdrop.com/users/billmc/
+DISTFILES=	adcomplain.pl.uu
 
-MAINTAINER=     ports@openbsd.org
+HOMEPAGE=	http://www.rdrop.com/users/billmc/adcomplain.html
+
+EXTRACT_CMD=	uudecode
+EXTRACT_BEFORE_ARGS=	#
+EXTRACT_AFTER_ARGS=	#
+
+MAINTAINER=	ports@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=   http://www.rdrop.com/users/billmc/
-DISTFILES=      adcomplain.pl.uu
+NO_BUILD=	Yes
 
 WRKDIST=	${WRKDIR}
-NO_BUILD=       Yes
-
-do-extract:
-	mkdir ${WRKSRC}
-	cd ${WRKSRC}; /usr/bin/uudecode < ${FULLDISTDIR}/${DISTFILES}
 
 do-install:
-	cd ${WRKSRC}; \
-	${INSTALL_SCRIPT} adcomplain.pl ${PREFIX}/bin/adcomplain
+	cd ${WRKSRC}; ${INSTALL_SCRIPT} adcomplain.pl ${PREFIX}/bin/adcomplain
 
 .include <bsd.port.mk>

mail/adcomplain/patches/patch-aa

@@ -1,16 +0,0 @@
-*** adcomplain.pl.orig	Sat May 16 23:52:32 1998
---- adcomplain.pl	Sat May 16 23:52:53 1998
-***************
-*** 1,7 ****
-! #! /bin/sh -- # -*- perl -*-
-! # first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
-! 
-! #! /bin/perl
-  
-  # But the first way is preferable, because we have a trick (below) that
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
---- 1,4 ----
-! #! /usr/bin/perl
-  
-  # But the first way is preferable, because we have a trick (below) that
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce

mail/adcomplain/patches/patch-adcomplain_pl

@@ -0,0 +1,11 @@
+--- adcomplain.pl.orig	Mon Jun 26 15:57:58 2000
++++ adcomplain.pl	Mon Jun 26 15:58:18 2000
+@@ -1,7 +1,4 @@
+-#! /bin/sh -- # -*- perl -*-
+-# first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
+-
+-#! /bin/perl
++#! /usr/bin/perl
+ 
+ # But the first way is preferable, because we have a trick (below) that
+ # allows perl to be _anywhere_ in the user's path.  The intent is to reduce

mail/adcomplain/pkg/DESCR

@@ -12,3 +12,5 @@ most appropriate way to complain. Mail bombing (e-mailing megabytes
 of useless data) and public flaming (replying on usenet, causing your
 complaint to be duplicated on every machine in the network) are
 discouraged.
+
+WWW: ${HOMEPAGE}

mail/adcomplain/pkg/PLIST

@@ -1 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/26 20:05:19 brad Exp $
 bin/adcomplain