- Rename nonstandard src directory to files

- Modernize ports

3 files changed, 5 insertions, 23 deletions

diff --git a/textproc/mkcatalog/Makefile b/textproc/mkcatalog/Makefile
index 971957489a88..b9031b2c61db 100644
--- a/textproc/mkcatalog/Makefile
+++ b/textproc/mkcatalog/Makefile
@@ -13,19 +13,13 @@ COMMENT=	Maintenance utility for sgml catalog files
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_FILES=	sbin/mkcatalog
-SCRIPTS_ENV=	CONFIGURE_TARGETS=${CONFIGURE_TARGETS}
-
-SRC=			${.CURDIR}/src
-CONFIGURE_TARGETS=	mkcatalog
+NO_ARCH=	yes
 
-pre-configure:
-.for f in ${CONFIGURE_TARGETS}
-	${CP} ${SRC}/${f}.in ${WRKDIR}
-.endfor
+SUB_FILES=	mkcatalog
+PLIST_FILES=	sbin/mkcatalog
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/mkcatalog \
+	${INSTALL_SCRIPT} ${WRKDIR}/mkcatalog \
 		${STAGEDIR}${PREFIX}/sbin/mkcatalog
 
 .include <bsd.port.mk>
diff --git a/textproc/mkcatalog/src/mkcatalog.in b/textproc/mkcatalog/files/mkcatalog.in
index 791952332c2e..bc7e08e61637 100644
--- a/textproc/mkcatalog/src/mkcatalog.in
+++ b/textproc/mkcatalog/files/mkcatalog.in
@@ -47,7 +47,7 @@ verbose_msg ()
     esac
 }
 
-PREFIX=@@PREFIX@@
+PREFIX=%%PREFIX%%
 TMPDIR=/tmp
 ARGV0=`sh_basename $0`
 
diff --git a/textproc/mkcatalog/scripts/configure b/textproc/mkcatalog/scripts/configure
deleted file mode 100644
index 8b2dbab2fa60..000000000000
--- a/textproc/mkcatalog/scripts/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-for i in ${CONFIGURE_TARGETS}
-do
-	if [ -f ${WRKDIR}/${i}.in ]; then
-	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-		-e "s;@@PREFIX@@;${PREFIX};g" \
-	> ${WRKDIR}/${i}
-	fi
-done