2 files changed, 37 insertions, 41 deletions

diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index 5baa9f76b39f..ddd3d1342001 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -1,4 +1,4 @@
-# Created by: jfitz
+# Created by: James FitzGibbon <jfitz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	msql
@@ -7,12 +7,12 @@ PORTREVISION=	4
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Mini SQL server, version 2
+COMMENT=	Mini SQL server (version 2)
 
 CONFLICTS=	msql-3* msql3-*
 
-USES=		perl5
-USE_LDCONFIG=	YES
+USES=		gmake perl5
+USE_LDCONFIG=	yes
 PKGMESSAGE=	${FILESDIR}/post-install-notes
 
 USERS=		${PORTNAME}
@@ -27,42 +27,41 @@ MAKE_ENV+=	WRKSRC=${WRKSRC}
 
 # Uncomment this if you're upgrading from <= b4 to >= b5 and have already
 # dumped your databases (or just build with -DOVERWRITE_DB)
-#OVERWRITE_DB=	YES
+#OVERWRITE_DB=	yes
 
 NO_STAGE=	yes
 post-patch:
-		cd ${FILESDIR}; \
-		cp slibinstall.mm slibrary_unix.mm ${WRKSRC}/src/makegen
-		@${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \
-			${WRKSRC}/src/conf/configure
+	${CP} -p ${FILESDIR}/*.mm ${WRKSRC}/src/makegen
+	@${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \
+		${WRKSRC}/src/conf/configure
 
 do-configure:
-		cd ${WRKSRC}; ${MAKE} target
-		cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup
-		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts
+	${MAKE_CMD} -C ${WRKSRC} target
+	(cd ${WRKSRC}/targets/freebsd && ${SETENV} ${MAKE_ENV} ./setup)
+	${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts
 
 pre-install:
-		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version
+	${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version
 
 post-install:
-		@${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
-		@${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
-		@for file in msqladmin msqlimport msqlexport; do\
-			${CHGRP} msql ${PREFIX}/bin/$$file; \
-		done
-		${CHGRP} msql ${PREFIX}/sbin/msql2d
-		@for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
-		done
-		@${CHMOD} 751 ${PREFIX}/etc/msql2/
-		@${CHOWN} -R msql:msql ${PREFIX}/etc/msql2/
-		@${MKDIR} ${PREFIX}/etc/rc.d
-		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
-			${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
-			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2.sh \
-				${PREFIX}/etc/rc.d/msql2.sh; \
-		fi
-		@${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
+	${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
+	@for file in msqladmin msqlimport msqlexport; do\
+		${CHGRP} msql ${PREFIX}/bin/$$file; \
+	done
+	${CHGRP} msql ${PREFIX}/sbin/msql2d
+	@for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
+		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
+	done
+	@${CHMOD} 751 ${PREFIX}/etc/msql2/
+	@${CHOWN} -R msql:msql ${PREFIX}/etc/msql2/
+	@${MKDIR} ${PREFIX}/etc/rc.d
+	@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
+		${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2.sh \
+			${PREFIX}/etc/rc.d/msql2.sh; \
+	fi
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/msql/files/patch-aa b/databases/msql/files/patch-aa
index d8250563197f..c1da71e55c1e 100644
--- a/databases/msql/files/patch-aa
+++ b/databases/msql/files/patch-aa
@@ -1,24 +1,21 @@
 --- Makefile.orig	Tue Dec 17 11:12:16 1996
 +++ Makefile	Tue Dec 17 11:13:26 1996
-@@ -18,14 +18,16 @@
- SHELL=/bin/sh
+@@ -15,15 +15,12 @@
+ SYM_OPT= -s
  
- all:
+ 
+-all:
 -	@ echo ""; echo "You have not read the installation procedures.";\
 -	echo "Please read the README file for build instructions.";\
 -	echo
-+	cd targets/freebsd ;\
-+	make all
-+
-+install:
-+	cd targets/freebsd ;\
-+	make install
++all install:
++	$(MAKE) -C targets/freebsd $@
  
  target:
  	@ scripts/make-target
 -
 -
-+	@ ( ARCH=`scripts/sys-arch`; cd targets; ln -s $$ARCH freebsd)
++	@ ( ARCH=`scripts/sys-arch`; ln -s $$ARCH targets/freebsd)
  
  dist:
  	@ echo; echo -n "Full Distribution - Enter archive file name : " ;\