ports/69318: [MAINTAINER] databases/msql3: change PORTNAME, add NOPORTDOCS, DOCSDIR, DATADIR

Andrey Slusar vasallia at ukr.net
Mon Jul 19 23:10:16 UTC 2004 

>Number:         69318
>Category:       ports
>Synopsis:       [MAINTAINER] databases/msql3: change PORTNAME, add NOPORTDOCS, DOCSDIR, DATADIR
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 23:10:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Jul 16 17:57:53 EEST 2004 root at santinel.home.ua:/usr/src/sys/i386/compile/ANRAY i386
>Description:
	$PORTNAME changed to msql3, added supporting option NOPORTDOCS, changed
	PORTREVISION, added DOCSDIR, DATADIR
>How-To-Repeat:
	
>Fix:

--- msql3.diff begins here ---
diff -ruN /usr/ports/databases/msql3/Makefile msql3/Makefile
--- /usr/ports/databases/msql3/Makefile	Sun Jul 18 02:23:15 2004
+++ msql3/Makefile	Mon Jul 19 23:16:04 2004
@@ -5,13 +5,17 @@
 # $FreeBSD: ports/databases/msql3/Makefile,v 1.62 2004/07/17 21:19:57 sem Exp $
 #
 
-PORTNAME=	msql
+PORTNAME=	msql3
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	databases
+DISTNAME=	msql-${PORTVERSION}
 
 MAINTAINER=	vasallia at ukr.net
 COMMENT=	Version 3 of the Mini SQL relational database system
 
+CONFLICTS=	msql-2.*
+
 INSTALLS_SHLIB=	YES
 USE_PERL5=	YES
 USE_REINPLACE=	YES
@@ -21,6 +25,13 @@
 
 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" \
@@ -34,19 +45,30 @@
 		@${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 <bsd.port.pre.mk>
 
diff -ruN /usr/ports/databases/msql3/files/patch-Makefile.tmpl msql3/files/patch-Makefile.tmpl
--- /usr/ports/databases/msql3/files/patch-Makefile.tmpl	Sat May 29 04:47:40 2004
+++ msql3/files/patch-Makefile.tmpl	Mon Jul 19 22:58:44 2004
@@ -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 -ruN /usr/ports/databases/msql3/pkg-plist msql3/pkg-plist
--- /usr/ports/databases/msql3/pkg-plist	Sun Jul 18 02:23:16 2004
+++ msql3/pkg-plist	Mon Jul 19 01:01:11 2004
@@ -15,29 +15,29 @@
 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
- at dirrm share/msql3/makegen
- at dirrm share/msql3
- at dirrm share/doc/msql3
+ at dirrm %%DATADIR%%/makegen
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- msql3.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list