Index: head/emulators/cpmtools/Makefile
===================================================================
--- head/emulators/cpmtools/Makefile	(revision 398224)
+++ head/emulators/cpmtools/Makefile	(revision 398225)
@@ -1,20 +1,18 @@
 # Created by: joerg
 # $FreeBSD$
 
 PORTNAME=	cpmtools
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/joerg
 DISTNAME=	cpm-${PORTVERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Utility to transfer files from/to CP/M (R) diskettes
 
 WRKSRC=		${WRKDIR}/cpm
 
 CFLAGS+=	-Wno-return-type
-MAKE_ARGS+=	PREFIX=${PREFIX} DFLAG="${CFLAGS}" \
-		DEST="${STAGEDIR}${PREFIX}/bin" \
-		HELPFILEDIR="${STAGEDIR}${PREFIX}/lib"
 
 .include <bsd.port.mk>
Index: head/emulators/cpmtools/files/patch-man_Makefile
===================================================================
--- head/emulators/cpmtools/files/patch-man_Makefile	(nonexistent)
+++ head/emulators/cpmtools/files/patch-man_Makefile	(revision 398225)
@@ -0,0 +1,14 @@
+--- man/Makefile.orig	1994-05-28 10:56:44 UTC
++++ man/Makefile
+@@ -3,9 +3,9 @@ all:;
+ #MANEXT=n
+ MANEXT=1
+ #MANDIR=/usr/man/man${MANEXT}
+-MANDIR=/usr/local/man/man${MANEXT}
++MANDIR=${PREFIX}/man/man${MANEXT}
+ 
+ install:
+-	cp cpm.1 ${DESTDIR}/${MANDIR}/cpm.${MANEXT}
++	${BSD_INSTALL_MAN} cpm.1 ${DESTDIR}${MANDIR}/cpm.${MANEXT}
+ 
+ clean:;

Property changes on: head/emulators/cpmtools/files/patch-man_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/cpmtools/files/patch-src_Makefile
===================================================================
--- head/emulators/cpmtools/files/patch-src_Makefile	(nonexistent)
+++ head/emulators/cpmtools/files/patch-src_Makefile	(revision 398225)
@@ -0,0 +1,42 @@
+--- src/Makefile.orig	1994-05-28 07:10:55 UTC
++++ src/Makefile
+@@ -1,14 +1,13 @@
+ #
+ #	Makefile	1.8	83/07/27
+ #
+-DEST	      = /usr/local/bin
+-DFLAG         = -g -O2
++DEST	      = ${PREFIX}/bin
+ 
+ HELPFILE      = cpm.hlp
+-HELPFILEDIR   = /usr/local/lib
++HELPFILEDIR   = ${PREFIX}/share/cpm
+ 
+ # CFLAGS	      = -O -DVAX ${DFLAG}
+-CFLAGS	      = ${DFLAG} -DHELPFILE=\"$(HELPFILEDIR)/$(HELPFILE)\"  # -DDEBUG
++CFLAGS	      += -DHELPFILE=\"$(HELPFILEDIR)/$(HELPFILE)\"  # -DDEBUG
+ 
+ EXTHDRS	      = /usr/include/ctype.h \
+ 		/usr/include/stdio.h
+@@ -23,7 +22,7 @@ LIBLIST       =
+ 
+ LIST	      = ls -C
+ 
+-LOADER	      = cc
++LOADER	      = ${CC}
+ 
+ MAKEFILE      = Makefile
+ 
+@@ -86,9 +85,9 @@ debug:;		@echo DFLAG = -g -DDEBUG > Make
+ clean:;		@rm -f $(OBJS)
+ 
+ install:	$(PROGRAM)
+-		@echo Installing $(PROGRAM) in $(DEST)
+-		@install -s $(PROGRAM) $(DEST)
+-		@cp $(HELPFILE) $(HELPFILEDIR)
++		${BSD_INSTALL_PROGRAM} $(PROGRAM) ${DESTDIR}$(DEST)
++		mkdir -p ${DESTDIR}$(HELPFILEDIR)
++		${BSD_INSTALL_DATA} $(HELPFILE) ${DESTDIR}$(HELPFILEDIR)
+ 
+ depend:;	@mkmf PROGRAM=$(PROGRAM) DEST=$(DEST)
+ 

Property changes on: head/emulators/cpmtools/files/patch-src_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/cpmtools/pkg-plist
===================================================================
--- head/emulators/cpmtools/pkg-plist	(revision 398224)
+++ head/emulators/cpmtools/pkg-plist	(revision 398225)
@@ -1,3 +1,3 @@
 bin/cpm
 man/man1/cpm.1.gz
-lib/cpm.hlp
+share/cpm/cpm.hlp