Update to snapshot 20030719.

Adds support for ACCT amongst other things.

4 files changed, 25 insertions, 46 deletions

diff --git a/ftp/omi/Makefile b/ftp/omi/Makefile
index aa75c53e56a7..65677f71e08e 100644
--- a/ftp/omi/Makefile
+++ b/ftp/omi/Makefile
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	omi
-PORTVERSION=	a9
+PORTVERSION=	20030719
 CATEGORIES=	ftp
-MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/ \
+MASTER_SITES=	http://www.secnetix.de/~olli/distfiles/ \
+		ftp://ftp.nuug.no/pub/anders/distfiles/ \
 		http://atreides.freenix.no/~anders/
 #	http://dorifer.heim3.tu-clausthal.de/~olli/omi/
-DISTNAME=	omi-alpha-9
 
-MAINTAINER=     anders@FreeBSD.org
+MAINTAINER=	anders@FreeBSD.org
 COMMENT=	"mirror" subtrees of FTP servers
 
+USE_REINPLACE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	freebsd
 
+pre-patch:
+	${REINPLACE_CMD} -E -e "s@^(OPTFLAGS).*@\1=${CFLAGS}@" \
+		${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/omi ${PREFIX}/bin
-	${INSTALL} -d -m 755 -o ${DOCOWN} -g ${DOCGRP} \
-		${PREFIX}/share/doc/omi
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/omi
-	${INSTALL_DATA} ${WRKSRC}/README.html ${PREFIX}/share/doc/omi
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/omi
-	${INSTALL_DATA} ${WRKSRC}/BSD-COPYRIGHT ${PREFIX}/share/doc/omi
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d -m 755 -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/BSD-COPYRIGHT ${DOCSDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/omi/distinfo b/ftp/omi/distinfo
index 407c4b72d796..21f4ecadaf5e 100644
--- a/ftp/omi/distinfo
+++ b/ftp/omi/distinfo
@@ -1,2 +1,2 @@
-MD5 (omi-alpha-9.tar.gz) = 916e1f06573db464c61ecead3fc50ef4
-SIZE (omi-alpha-9.tar.gz) = 84985
+MD5 (omi-20030719.tar.gz) = 0eab8bcb82ed7c8b445d44e201b5bb2c
+SIZE (omi-20030719.tar.gz) = 89240
diff --git a/ftp/omi/files/patch-aa b/ftp/omi/files/patch-aa
deleted file mode 100644
index 8a042c6479b5..000000000000
--- a/ftp/omi/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** Makefile.orig	Sat Dec 19 07:19:54 1998
---- Makefile	Sat Dec 19 18:25:56 1998
-***************
-*** 12,23 ****
-  #   Normally you should not have to change anything else.
-  #
-  
-! PREFIX=/usr/local
-  BINDIR=$(PREFIX)/bin
-  MANDIR=$(PREFIX)/man
-  SECTION=1
-  
-! OPTFLAGS=-g
-  #OPTFLAGS=-O5
-  #OPTFLAGS=-fast -native -xO5
-  
---- 12,23 ----
-  #   Normally you should not have to change anything else.
-  #
-  
-! PREFIX?=/usr/local
-  BINDIR=$(PREFIX)/bin
-  MANDIR=$(PREFIX)/man
-  SECTION=1
-  
-! OPTFLAGS:=${CFLAGS}
-  #OPTFLAGS=-O5
-  #OPTFLAGS=-fast -native -xO5
-  
diff --git a/ftp/omi/pkg-plist b/ftp/omi/pkg-plist
index a87b721ee897..6a51e71bc0e8 100644
--- a/ftp/omi/pkg-plist
+++ b/ftp/omi/pkg-plist
@@ -1,6 +1,6 @@
 bin/omi
-share/doc/omi/CHANGES
-share/doc/omi/README.txt
-share/doc/omi/README.html
-share/doc/omi/BSD-COPYRIGHT
-@dirrm share/doc/omi
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/BSD-COPYRIGHT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%