sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup the port a bit before it can be unbroken further:

Browse source 
- Add gmake to USES, it builds better with GNU make
- Use better syntax in top Makefile (files/patch-aa)
- Reindent commands in recipes; touch Makefile header and COMMENT
This commit is contained in:
Alexey Dokuchaev 2014-02-07 10:43:04 +00:00
parent af3dcea92a
commit 969fbda17a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343211
2 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
databases/msql/Makefile
View file

@ -1,4 +1,4 @@
# Created by: jfitz # Created by: James FitzGibbon <jfitz@FreeBSD.org>
# $FreeBSD$ # $FreeBSD$
PORTNAME= msql PORTNAME= msql
@ -7,12 +7,12 @@ PORTREVISION= 4
CATEGORIES= databases CATEGORIES= databases
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= The Mini SQL server, version 2 COMMENT= Mini SQL server (version 2)
CONFLICTS= msql-3* msql3-* CONFLICTS= msql-3* msql3-*
USES= perl5 USES= gmake perl5
USE_LDCONFIG= YES USE_LDCONFIG= yes
PKGMESSAGE= ${FILESDIR}/post-install-notes PKGMESSAGE= ${FILESDIR}/post-install-notes
USERS= ${PORTNAME} USERS= ${PORTNAME}
@ -27,26 +27,25 @@ MAKE_ENV+= WRKSRC=${WRKSRC}
# Uncomment this if you're upgrading from <= b4 to >= b5 and have already # Uncomment this if you're upgrading from <= b4 to >= b5 and have already
# dumped your databases (or just build with -DOVERWRITE_DB) # dumped your databases (or just build with -DOVERWRITE_DB)
#OVERWRITE_DB= YES #OVERWRITE_DB= yes
NO_STAGE= yes NO_STAGE= yes
post-patch: post-patch:
cd ${FILESDIR}; \ ${CP} -p ${FILESDIR}/*.mm ${WRKSRC}/src/makegen
cp slibinstall.mm slibrary_unix.mm ${WRKSRC}/src/makegen
@${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \ @${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \
${WRKSRC}/src/conf/configure ${WRKSRC}/src/conf/configure
do-configure: do-configure:
cd ${WRKSRC}; ${MAKE} target ${MAKE_CMD} -C ${WRKSRC} target
cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup (cd ${WRKSRC}/targets/freebsd && ${SETENV} ${MAKE_ENV} ./setup)
@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts ${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts
pre-install: pre-install:
@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version ${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version
post-install: post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
@${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
@for file in msqladmin msqlimport msqlexport; do\ @for file in msqladmin msqlimport msqlexport; do\
${CHGRP} msql ${PREFIX}/bin/$$file; \ ${CHGRP} msql ${PREFIX}/bin/$$file; \
done done

17
databases/msql/files/patch-aa
View file

@ -1,24 +1,21 @@
--- Makefile.orig Tue Dec 17 11:12:16 1996 --- Makefile.orig Tue Dec 17 11:12:16 1996
+++ Makefile Tue Dec 17 11:13:26 1996 +++ Makefile Tue Dec 17 11:13:26 1996
@@ -18,14 +18,16 @@ @@ -15,15 +15,12 @@
SHELL=/bin/sh SYM_OPT= -s
all:
-all:
- @ echo ""; echo "You have not read the installation procedures.";\ - @ echo ""; echo "You have not read the installation procedures.";\
- echo "Please read the README file for build instructions.";\ - echo "Please read the README file for build instructions.";\
- echo - echo
+ cd targets/freebsd ;\ +all install:
+ make all + $(MAKE) -C targets/freebsd $@
+
+install:
+ cd targets/freebsd ;\
+ make install
target: target:
@ scripts/make-target @ scripts/make-target
- -
- -
+ @ ( ARCH=`scripts/sys-arch`; cd targets; ln -s $$ARCH freebsd) + @ ( ARCH=`scripts/sys-arch`; ln -s $$ARCH targets/freebsd)
dist: dist:
@ echo; echo -n "Full Distribution - Enter archive file name : " ;\ @ echo; echo -n "Full Distribution - Enter archive file name : " ;\