From 080940f4387405e53ecb5534f640fb79b103ff89 Mon Sep 17 00:00:00 2001 From: sem Date: Thu, 22 Jul 2004 06:12:22 +0000 Subject: * Set LATEST_LINK * Rework DATA and DOCS install (NOPORTDOCS compliant) PR: ports/69318 Submitted by: maintainer Approved by: krion (mentor) (implicitly) --- databases/msql3/Makefile | 37 ++++++++++++++++++------ databases/msql3/files/patch-Makefile.tmpl | 16 ++--------- databases/msql3/files/patch-make-install | 6 ++-- databases/msql3/pkg-plist | 48 +++++++++++++++---------------- 4 files changed, 58 insertions(+), 49 deletions(-) (limited to 'databases/msql3') diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile index 8b0a57a9f9c7..6e98062183af 100644 --- a/databases/msql3/Makefile +++ b/databases/msql3/Makefile @@ -7,6 +7,7 @@ PORTNAME= msql PORTVERSION= 3.5 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= vasallia@ukr.net @@ -18,11 +19,20 @@ INSTALLS_SHLIB= YES USE_PERL5= YES USE_REINPLACE= YES +LATEST_LINK= msql3 + # Not free for commercial use. RESTRICTED= "restrictive copyright (no commercial use)" MAKE_ENV+= WRKSRC=${WRKSRC} +MSQLDATA= directory.mm dll_os2.mm install.mm lex.mm libinstall.mm \ + library_os2.mm library_unix.mm makegen makegen.cf object.mm \ + program.mm touch.mm yacc.mm + +DOCS= README RELEASE_NOTES BUGS doc/License doc/Manual \ + doc/Perl doc/acl.txt + post-patch: cd ${FILESDIR}; \ ${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \ @@ -36,19 +46,30 @@ pre-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin - @for f in msqladmin msqlimport msqlexport; do\ - ${CHGRP} msql ${PREFIX}/bin/${f}; \ - done - ${CHGRP} msql ${PREFIX}/sbin/msql3d - @${CHMOD} 751 ${PREFIX}/etc/msql3/ - @${CHOWN} -R msql:msql ${PREFIX}/etc/msql3/ - @${MKDIR} ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin +.for f in msqladmin msqlimport msqlexport + ${CHGRP} msql ${PREFIX}/bin/${f} +.endfor + ${CHGRP} msql ${PREFIX}/sbin/msql3d + ${CHMOD} 751 ${PREFIX}/etc/msql3/ + ${CHOWN} -R msql:msql ${PREFIX}/etc/msql3/ + ${MKDIR} ${PREFIX}/etc/rc.d @if [ ! -f ${PREFIX}/etc/rc.d/msql3.sh ]; then \ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql3.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql3.sh \ ${PREFIX}/etc/rc.d/msql3.sh; \ fi + ${MKDIR} ${DATADIR}/makegen +.for i in ${MSQLDATA} + ${INSTALL_SCRIPT} ${WRKSRC}/src/makegen/${i} ${DATADIR}/makegen +.endfor + ${INSTALL_SCRIPT} ${WRKSRC}/src/site.mm ${DATADIR}/makegen +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif .include diff --git a/databases/msql3/files/patch-Makefile.tmpl b/databases/msql3/files/patch-Makefile.tmpl index b026f4430c9e..7588ccb99707 100644 --- a/databases/msql3/files/patch-Makefile.tmpl +++ b/databases/msql3/files/patch-Makefile.tmpl @@ -1,6 +1,6 @@ --- src/Makefile.tmpl.orig Fri Aug 23 01:36:26 2002 -+++ src/Makefile.tmpl Sat May 29 04:12:49 2004 -@@ -35,22 +35,22 @@ ++++ src/Makefile.tmpl Mon Jul 19 22:58:11 2004 +@@ -35,22 +35,12 @@ echo install :: @@ -9,17 +9,7 @@ - chmod 755 $(INST_DIR)/makegen/*;\\ - cp site.mm $(INST_DIR)/makegen;\\ - if test -f $(INST_DIR)/msql.conf;\ -+ @cp ../README $(INST_DIR)/share/doc/msql3;\\ -+ cp ../RELEASE_NOTES $(INST_DIR)/share/doc/msql3;\\ -+ cp ../BUGS $(INST_DIR)/share/doc/msql3;\\ -+ cp ../doc/License $(INST_DIR)/share/doc/msql3;\\ -+ cp ../doc/Manual $(INST_DIR)/share/doc/msql3;\\ -+ cp ../doc/Perl $(INST_DIR)/share/doc/msql3;\\ -+ cp ../doc/acl.txt $(INST_DIR)/share/doc/msql3;\\ -+ cp makegen/makegen makegen/*.cf makegen/*.mm $(INST_DIR)/share/msql3/makegen;\\ -+ chmod 755 $(INST_DIR)/share/msql3/makegen/*;\\ -+ cp site.mm $(INST_DIR)/share/msql3/makegen;\\ -+ if test -f $(INST_DIR)/etc/msql3/msql.conf;\ ++ @if test -f $(INST_DIR)/etc/msql3/msql.conf;\ then\ - rm -f $(INST_DIR)/msql.conf.old;\ - mv $(INST_DIR)/msql.conf $(INST_DIR)/msql.conf.old;\ diff --git a/databases/msql3/files/patch-make-install b/databases/msql3/files/patch-make-install index 9e71142ca284..efd8bab56eda 100644 --- a/databases/msql3/files/patch-make-install +++ b/databases/msql3/files/patch-make-install @@ -1,6 +1,6 @@ --- scripts/make-install.orig Mon Feb 5 13:37:55 2001 -+++ scripts/make-install Sat May 29 01:23:29 2004 -@@ -1,16 +1,12 @@ ++++ scripts/make-install Wed Jul 21 13:16:43 2004 +@@ -1,16 +1,10 @@ #!/bin/sh -INST_DIR=$1 @@ -22,6 +22,4 @@ +scripts/mkinstalldirs 0755 /var/spool/msql3 +scripts/mkinstalldirs 0700 /var/db/msql3db +scripts/mkinstalldirs 0700 /var/db/msql3db/.tmp -+scripts/mkinstalldirs 0755 $INST_DIR/share/doc/msql3 -+scripts/mkinstalldirs 0755 $INST_DIR/share/msql3/makegen +/usr/sbin/chown -R msql:msql /var/db/msql3db /var/spool/msql3 diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist index 95d331f3b4d2..3b4de2d3450b 100644 --- a/databases/msql3/pkg-plist +++ b/databases/msql3/pkg-plist @@ -15,29 +15,29 @@ include/msql.h include/regexp.h lib/libmsql.a lib/libregexp.a -share/msql3/makegen/directory.mm -share/msql3/makegen/dll_os2.mm -share/msql3/makegen/install.mm -share/msql3/makegen/lex.mm -share/msql3/makegen/libinstall.mm -share/msql3/makegen/library_os2.mm -share/msql3/makegen/library_unix.mm -share/msql3/makegen/makegen -share/msql3/makegen/makegen.cf -share/msql3/makegen/object.mm -share/msql3/makegen/program.mm -share/msql3/makegen/site.mm -share/msql3/makegen/touch.mm -share/msql3/makegen/yacc.mm -share/doc/msql3/BUGS -share/doc/msql3/README -share/doc/msql3/RELEASE_NOTES -share/doc/msql3/License -share/doc/msql3/Manual -share/doc/msql3/Perl -share/doc/msql3/acl.txt +%%DATADIR%%/makegen/directory.mm +%%DATADIR%%/makegen/dll_os2.mm +%%DATADIR%%/makegen/install.mm +%%DATADIR%%/makegen/lex.mm +%%DATADIR%%/makegen/libinstall.mm +%%DATADIR%%/makegen/library_os2.mm +%%DATADIR%%/makegen/library_unix.mm +%%DATADIR%%/makegen/makegen +%%DATADIR%%/makegen/makegen.cf +%%DATADIR%%/makegen/object.mm +%%DATADIR%%/makegen/program.mm +%%DATADIR%%/makegen/site.mm +%%DATADIR%%/makegen/touch.mm +%%DATADIR%%/makegen/yacc.mm +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES +%%PORTDOCS%%%%DOCSDIR%%/License +%%PORTDOCS%%%%DOCSDIR%%/Manual +%%PORTDOCS%%%%DOCSDIR%%/Perl +%%PORTDOCS%%%%DOCSDIR%%/acl.txt @dirrm etc/msql3 @dirrm include/common -@dirrm share/msql3/makegen -@dirrm share/msql3 -@dirrm share/doc/msql3 +@dirrm %%DATADIR%%/makegen +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit