Date: Wed, 18 May 2005 15:44:19 -0300 (BRST) From: Renato Botelho <freebsd@galle.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81214: [PATCH] databases/firebird-server: Polish Makefile and readd the work to not change files automatically Message-ID: <200505181844.j4IIiJvS022201@data.galle.com.br> Resent-Message-ID: <200505181850.j4IIo2vV041989@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81214 >Category: ports >Synopsis: [PATCH] databases/firebird-server: Polish Makefile and readd the work to not change files automatically >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 18 18:50:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.4-RELEASE i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Tue May 10 09:20:42 BRST 2005 >Description: [DESCRIBE CHANGES] - Use PORTDOCS and SUBFILES, respect NOPORTDOCS - Use DOCSDIR and EXAMPLESDIR - back to use do-build - Add $FreeBSD$ tag to pkg-plist* and pkg-install - Remove code that changes automatically /etc/services and /etc/inetd.conf and change pkg-message to reflect this - Change my email to freebsd@galle.com.br Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- firebird-server-1.5.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- Makefile 17 May 2005 16:02:37 -0000 1.38 +++ Makefile 18 May 2005 18:42:13 -0000 @@ -13,7 +13,7 @@ PKGNAMESUFFIX?= -server DISTNAME= firebird-1.5.2.4731 -MAINTAINER= renato@galle.com.br +MAINTAINER= freebsd@galle.com.br COMMENT?= The open-source InterBase(tm) 6.0 spin-off (Classic version) USE_REINPLACE= yes @@ -54,6 +54,8 @@ SHAREOWN= firebird SHAREGRP= firebird +SUB_FILES= pkg-install pkg-message aliases.conf + PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -67,6 +69,10 @@ embed_util embed_gdef embed_qli libfbclient extlib INSTALLS_SHLIB= yes + +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif .endif .include <bsd.port.pre.mk> @@ -90,35 +96,14 @@ @${REINPLACE_CMD} -e 's|^\(LINK_OPTS +=.*\)$$|\1 -L${LOCALBASE}/lib|' \ ${WRKSRC}/builds/posix/Makefile.in.inet_server -post-build: - ${SED} 's|%%PREFIX%%|${PREFIX}|g' \ - < ${FILESDIR}/pkg-message.in \ - > ${PKGMESSAGE} - - ${SED} -e 's|%%PREFIX%%|${PREFIX}/firebird|g' \ - < ${FILESDIR}/pkg-install.in \ - > ${PKGINSTALL} - - ${SED} -e "s|%%PREFIX%%|${PREFIX}/firebird|g" \ - < ${FILESDIR}/aliases.conf.in \ - > ${WRKDIR}/aliases.conf - pre-install: ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL post-install: ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - @${ECHO_MSG} @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .endif -patch-autotools: - @${DO_NADA} - -run-autotools: - @${DO_NADA} - do-configure: @(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \ ${AUTOTOOLS_VARS} ./autogen.sh ${AUTOGENARGS}) @@ -127,6 +112,9 @@ @${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \ ${WRKSRC}/src/dsql/parse.cpp +do-build: + @(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${GMAKE} ${ALL_TARGET}) + do-install: .if !defined(CLIENT_ONLY) @@ -165,11 +153,6 @@ .else -.for dir in include share/doc/firebird \ - share/doc/firebird/sql.extensions share/examples/firebird - ${MKDIR} ${PREFIX}/${dir} -.endfor - .for f in fb_lock_print gbak gdef gds_drop gfix gpre gsec gstat isql qli ${INSTALL_PROGRAM} ${WRKSRC}/gen/firebird/bin/${f} ${PREFIX}/bin .endfor @@ -187,15 +170,20 @@ ${INSTALL_PROGRAM} ${WRKSRC}/gen/firebird/lib/libib_util.so ${PREFIX}/lib + @${MKDIR} ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/doc/WhatsNew ${PREFIX}/share/doc/firebird - ${INSTALL_DATA} ${WRKSRC}/doc/README.* ${PREFIX}/share/doc/firebird - ${INSTALL_DATA} ${WRKSRC}/doc/README.user ${PREFIX}/share/doc/firebird/README - ${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/README.* ${PREFIX}/share/doc/firebird/sql.extensions +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR}/sql.extensions + ${INSTALL_DATA} ${WRKSRC}/doc/WhatsNew ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/README.* ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/README.user ${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/README.* ${DOCSDIR}/sql.extensions +.endif # Install examples - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/examples/v5/* ${PREFIX}/share/examples/firebird + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/examples/v5/* ${EXAMPLESDIR} .endif .include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/pkg-plist,v retrieving revision 1.9 diff -u -r1.9 pkg-plist --- pkg-plist 17 May 2005 16:02:37 -0000 1.9 +++ pkg-plist 18 May 2005 18:42:13 -0000 @@ -1,3 +1,4 @@ +@comment $FreeBSD$ firebird/RELNOTES firebird/UDF/fbudf.so firebird/UDF/fbudf.sql Index: pkg-plist.client =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/pkg-plist.client,v retrieving revision 1.1 diff -u -r1.1 pkg-plist.client --- pkg-plist.client 17 May 2005 16:02:37 -0000 1.1 +++ pkg-plist.client 18 May 2005 18:42:14 -0000 @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/fb_lock_print bin/gbak bin/gdef @@ -23,30 +24,6 @@ lib/libgds.so lib/libgds.so.1 lib/libib_util.so -%%DOCSDIR%%/README.NTSecurity -%%DOCSDIR%%/README.Win32LibraryInstallation.txt -%%DOCSDIR%%/README.build.mingw.html -%%DOCSDIR%%/README.build.msvc.html -%%DOCSDIR%%/README.install.Solaris_on_Intel -%%DOCSDIR%%/README.instsvc -%%DOCSDIR%%/README.makefiles -%%DOCSDIR%%/README.user -%%DOCSDIR%%/README.user.embedded -%%DOCSDIR%%/README.user.troubleshooting -%%DOCSDIR%%/README -%%DOCSDIR%%/WhatsNew -%%DOCSDIR%%/sql.extensions/README.aggregate_tracking -%%DOCSDIR%%/sql.extensions/README.case -%%DOCSDIR%%/sql.extensions/README.coalesce -%%DOCSDIR%%/sql.extensions/README.context_variables -%%DOCSDIR%%/sql.extensions/README.data_types -%%DOCSDIR%%/sql.extensions/README.exception_handling -%%DOCSDIR%%/sql.extensions/README.execute_statement -%%DOCSDIR%%/sql.extensions/README.explicit_locks -%%DOCSDIR%%/sql.extensions/README.nullif -%%DOCSDIR%%/sql.extensions/README.order_by_expressions_nulls -%%DOCSDIR%%/sql.extensions/README.savepoints -%%DOCSDIR%%/sql.extensions/README.universal_triggers %%EXAMPLESDIR%%/align.h %%EXAMPLESDIR%%/api1.c %%EXAMPLESDIR%%/api10.c @@ -94,6 +71,4 @@ %%EXAMPLESDIR%%/stat9.e %%EXAMPLESDIR%%/udf.sql %%EXAMPLESDIR%%/udflib.c -@dirrm %%DOCSDIR%%/sql.extensions -@dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%% Index: files/pkg-install.in =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/files/pkg-install.in,v retrieving revision 1.1 diff -u -r1.1 pkg-install.in --- files/pkg-install.in 17 May 2005 16:02:37 -0000 1.1 +++ files/pkg-install.in 18 May 2005 18:42:14 -0000 @@ -1,4 +1,7 @@ #!/bin/sh +# +# $FreeBSD$ +# PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:%%PREFIX%%/bin PREFIX=%%PREFIX%% @@ -50,21 +53,4 @@ chown ${USER}:${GROUP} ${PREFIX}/$f chmod 660 ${PREFIX}/${f} done - - # add the gds service and restart inetd - cat /etc/services | grep -v gds_db > /etc/services.new - cat >>/etc/services.new <<EOF -gds_db 3050/tcp #InterBase Database Remote Protocol -EOF - mv /etc/services.new /etc/services - - cat /etc/inetd.conf | grep -v gds_db > /etc/inetd.conf.new - cat >>/etc/inetd.conf.new <<EOF -gds_db stream tcp nowait firebird ${PREFIX}/bin/fb_inet_server fb_inet_server -EOF - mv /etc/inetd.conf.new /etc/inetd.conf - - if [ -f /var/run/inetd.pid ]; then - kill -HUP `cat /var/run/inetd.pid` - fi esac Index: files/pkg-message.in =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/files/pkg-message.in,v retrieving revision 1.1 diff -u -r1.1 pkg-message.in --- files/pkg-message.in 17 May 2005 16:02:37 -0000 1.1 +++ files/pkg-message.in 18 May 2005 18:42:14 -0000 @@ -1,8 +1,20 @@ + --------------------------------------------------------- -Firebird is now installed. A symbolic link from -/usr/interbase -> %%PREFIX%%/firebird may be needed -for compatibility with existing programs that use -Firebird. +Firebird is now installed. + +To start the server add the following line to /etc/services: + +gds_db 3050/tcp #InterBase Database Remote Protocol + +And add the following line to /etc/inetd.conf + +gds_db stream tcp nowait firebird %%PREFIX%%/firebird/bin/fb_inet_server fb_inet_server + +And finally restart inetd. + +A symbolic link from /usr/interbase -> %%PREFIX%%/firebird +may be needed for compatibility with existing programs +that use Firebird. The symbolic link can be created with: @@ -20,3 +32,4 @@ See %%PREFIX%%/firebird/RELNOTES for more. --------------------------------------------------------- + --- firebird-server-1.5.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505181844.j4IIiJvS022201>