diff --git a/misc/crosspad/Makefile b/misc/crosspad/Makefile
index c93bfa7e839a..83e03a0c3055 100644
--- a/misc/crosspad/Makefile
+++ b/misc/crosspad/Makefile
@@ -3,32 +3,30 @@
 
 PORTNAME=	crosspad
 PORTVERSION=	19991202
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.itojun.org/pub/misc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Crosspad data downloader/converter
 
+USES=		perl5
+USE_PERL5=	run
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_path_path_perl=${PERL}
 WRKSRC=		${WRKDIR}/crosspad/build
 
-MAN1=	crosspad2ps.1 crosspad2eps.1 crosspad2tgif.1 crosspad2idraw.1 \
-	padload.1
-
 DOCS=	PROTOCOL README.english README.japanese
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -E -e 's,(bin|man)dir),DESTDIR)$$(&,g' \
+		-e 's,-(g|o) (bin|uucp),,g' \
+		${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/crosspad
-	for i in $(DOCS); do \
-		${INSTALL_DATA} ${WRKSRC}/../$$i ${PREFIX}/share/doc/crosspad; \
-	done
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/../|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/crosspad/files/patch-aa b/misc/crosspad/files/patch-aa
deleted file mode 100644
index 0031b1587235..000000000000
--- a/misc/crosspad/files/patch-aa
+++ /dev/null
@@ -1,78 +0,0 @@
-hardcode perl to /usr/bin/perl
-
---- configure.orig	Thu Sep 24 00:01:04 1998
-+++ configure	Thu Sep 24 00:02:11 1998
-@@ -628,33 +628,34 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--for ac_prog in perl perl5 perl4
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:637: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_path_perl'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case "$path_perl" in
--  /*)
--  ac_cv_path_path_perl="$path_perl" # Let the user override the test with a path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_path_path_perl="$ac_dir/$ac_word"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac
--fi
--path_perl="$ac_cv_path_path_perl"
-+#for ac_prog in perl perl5 perl4
-+#do
-+## Extract the first word of "$ac_prog", so it can be a program name with args.
-+#set dummy $ac_prog; ac_word=$2
-+#echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+#echo "configure:637: checking for $ac_word" >&5
-+#if eval "test \"`echo '$''{'ac_cv_path_path_perl'+set}'`\" = set"; then
-+#  echo $ac_n "(cached) $ac_c" 1>&6
-+#else
-+#  case "$path_perl" in
-+#  /*)
-+#  ac_cv_path_path_perl="$path_perl" # Let the user override the test with a path.
-+#  ;;
-+#  *)
-+#  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+#  for ac_dir in $PATH; do
-+#    test -z "$ac_dir" && ac_dir=.
-+#    if test -f $ac_dir/$ac_word; then
-+#      ac_cv_path_path_perl="$ac_dir/$ac_word"
-+#      break
-+#    fi
-+#  done
-+#  IFS="$ac_save_ifs"
-+#  ;;
-+#esac
-+#fi
-+#path_perl="$ac_cv_path_path_perl"
-+path_perl=/usr/bin/perl
- if test -n "$path_perl"; then
-   echo "$ac_t""$path_perl" 1>&6
- else
-@@ -662,9 +663,8 @@
- fi
- 
- test -n "$path_perl" && break
--done
--test -n "$path_perl" || path_perl="no"
--
-+#done
-+#test -n "$path_perl" || path_perl="no"
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
- echo "configure:671: checking whether ln -s works" >&5
diff --git a/misc/crosspad/pkg-plist b/misc/crosspad/pkg-plist
index 8815b9676df1..fa6cec7025a2 100644
--- a/misc/crosspad/pkg-plist
+++ b/misc/crosspad/pkg-plist
@@ -1,12 +1,16 @@
-bin/padload
+bin/crosspad2eps
+bin/crosspad2idraw
 bin/crosspad2ps
-@exec cd %D/bin; ln -s crosspad2ps crosspad2eps
-@exec cd %D/bin; ln -s crosspad2ps crosspad2tgif
-@exec cd %D/bin; ln -s crosspad2ps crosspad2idraw
-@unexec rm %D/bin/crosspad2eps 2>&1 >/dev/null || true
-@unexec rm %D/bin/crosspad2tgif 2>&1 >/dev/null || true
-@unexec rm %D/bin/crosspad2idraw 2>&1 >/dev/null || true
-%%PORTDOCS%%share/doc/crosspad/PROTOCOL
-%%PORTDOCS%%share/doc/crosspad/README.english
-%%PORTDOCS%%share/doc/crosspad/README.japanese
-%%PORTDOCS%%@dirrm share/doc/crosspad
+bin/crosspad2tgif
+@owner uucp
+bin/padload
+@owner
+man/man1/crosspad2eps.1.gz
+man/man1/crosspad2idraw.1.gz
+man/man1/crosspad2ps.1.gz
+man/man1/crosspad2tgif.1.gz
+man/man1/padload.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/PROTOCOL
+%%PORTDOCS%%%%DOCSDIR%%/README.english
+%%PORTDOCS%%%%DOCSDIR%%/README.japanese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%