Index: head/databases/firebird25-server/Makefile =================================================================== --- head/databases/firebird25-server/Makefile (revision 398896) +++ head/databases/firebird25-server/Makefile (revision 398897) @@ -1,213 +1,221 @@ # Created by: Alonso Cárdenas Márquez # $FreeBSD$ PORTNAME= firebird PORTVERSION= 2.5.4 +PORTREVISION= 1 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.26856-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT?= Firebird-2 relational database (server) +LICENSE= IDPL IPL +LICENSE_COMB= multi +LICENSE_NAME_IDPL= Initial Developer's Public License +LICENSE_NAME_IPL= InterBase Public License +LICENSE_FILE_IDPL= ${WRKSRC}/builds/install/misc/IDPLicense.txt +LICENSE_FILE_IPL= ${WRKSRC}/builds/install/misc/IPLicense.txt +LICENSE_PERMS_IDPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_IPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + CONFLICTS?= ${PORTNAME}20-client-* \ ${PORTNAME}21-client-* \ ${PORTNAME}20-server-* \ ${PORTNAME}21-server-* LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu -USES= bison tar:bzip2 gmake +USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-system-editline \ --with-system-icu \ --prefix=${LOCALSTATEDIR} \ --exec-prefix=${PREFIX} \ --with-fbconf=${PREFIX}/${CONFDIR} \ --with-fbglock=${LOCALSTATEDIR} \ --with-fbhelp=${LOCALSTATEDIR}/help \ --with-fbintl=${LIBEXECDIR}/intl \ --with-fblog=${LOCALSTATEDIR} \ --with-fbmsg=${DATADIR} \ --with-fbplugins=${LIBEXECDIR}/plugins \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ --with-fbudf=${LIBEXECDIR}/UDF -CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" +CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" \ + ac_cv_header_atomic_ops_h="no" \ + ac_cv_lib_atomic_ops_main="no" \ + ac_cv_lib_edit_readline="yes" -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - LOCALSTATEDIR= /var/db/firebird CONFDIR= etc/firebird LIBEXECDIR= ${PREFIX}/libexec/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}" # Don't use ld for linking, use gcc LD= ${CC} # Don't strip binary files STRIP= ONLY_FOR_ARCHS= i386 amd64 CONFLICTS+= firebird-client-2.0* firebird-server-2.0* \ firebird-client-2.1* firebird-server-2.1* INSTALL_FB= ${INSTALL} ${COPY} IPCRM_CMD= /usr/bin/ipcrm IPCS_CMD= /usr/bin/ipcs IPCCHECK!= ${IPCRM_CMD} -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .if !defined(CLIENT_ONLY) # Server part stuff +BUILD_DEPENDS= ${LOCALBASE}/lib/libedit.so:${PORTSDIR}/devel/libedit LIB_DEPENDS+= libfbembed.so:${PORTSDIR}/databases/firebird25-client CONFIGURE_ARGS+=--enable-superserver ALL_TARGET= firebird_embedded firebird_server USE_RC_SUBR= firebird SUB_FILES= pkg-message UTIL_SBIN= fb_inet_server fb_lock_print fb_smp_server fbserver UTIL_BIN= fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \ nbackup UDF_SO= ib_udf.so fbudf.so UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql PKGINSTALL?= ${PKGDIR}/pkg-install-server .else # Client part stuff +LIB_DEPENDS+= libedit.so.0:${PORTSDIR}/devel/libedit + ALL_TARGET= firebird_basic libfbembed libfbclient embed_isql embed_gpre \ embed_gdef embed_qli extlib -USES+= libedit - USE_LDCONFIG= yes CLIENT_BIN= gpre isql-fb qli OPTIONS_DEFINE= DOCS DOCS_PORTDOCS= * FB_DOCS_FILES= WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \ ods11-index-structure.html FB_DOCS_DIRS= sql.extensions license upgrade .endif MAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}" MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" - -post-extract: - @${RM} -rf ${WRKSRC}/extern/icu post-patch: ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+ ${REINPLACE_CMD} -e \ 's|/isql|/isql-fb|g' -e \ 's|/gstat|/fbstat|g' -e \ 's|/gsplit|/fbsplit|g' ${WRKSRC}/builds/posix/make.defaults .include .if ${ARCH} == "amd64" CFLAGS+= -DAMD64 .endif .if !defined(CLIENT_ONLY) USERS= ${PORTNAME} GROUPS= ${USERS} .endif .ifndef WITHOUT_IPC_CLEANUP pre-build: .if !defined(CLIENT_ONLY) @${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif ${MAKE} -C ${WRKSRC}/extern/btyacc [ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \ ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build post-build: ${IPCS_CMD} -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build ${DIFF} -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build | \ ${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh ${SH} ${WRKDIR}/ipcrm.sh .endif do-install: .if !defined(CLIENT_ONLY) ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/aliases.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf ${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \ ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_FB} -m 0660 ${WRKSRC}/gen/firebird/security2.fdb ${STAGEDIR}${LOCALSTATEDIR}/security2.fdb.sample ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.so .else # defined CLIENT_ONLY ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/install/misc/firebird.conf > ${WRKDIR}/firebird.conf @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2.5 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so @${MKDIR} ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${STAGEDIR}${PREFIX}/include @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!} @${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR} @${LN} -sf ${DOCSDIR}/README.user ${STAGEDIR}${DOCSDIR}/README @${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions @${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license @${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade .endif .include Index: head/databases/firebird25-server/files/patch-builds-posix_make.defaults =================================================================== --- head/databases/firebird25-server/files/patch-builds-posix_make.defaults (revision 398896) +++ head/databases/firebird25-server/files/patch-builds-posix_make.defaults (nonexistent) @@ -1,31 +0,0 @@ ---- builds/posix/make.defaults 2010-09-08 03:41:23.000000000 -0500 -+++ builds/posix/make.defaults 2010-12-18 20:25:29.000000000 -0500 -@@ -127,7 +127,7 @@ - CHMOD= chmod - CHMOD_6= chmod 666 - CHMOD_7= chmod 777 --CHMOD_S7= chmod 06777 -+CHMOD_S7= chmod 04555 - MV= mv -f - TOUCH= touch - CP= cp -@@ -153,7 +153,7 @@ - STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) - - LINK_LIBS = @LIBS@ --ICU_LIBS = -licuuc -licudata -licui18n -+ICU_LIBS = `icu-config --ldflags-libsonly` `icu-config --ldflags-searchpath` - STATICLINK_LIBS = @LIBS@ - SO_LINK_LIBS = @LIBS@ - -@@ -230,10 +230,6 @@ - endif - endif - --LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \ -- $(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \ -- $(LIB)/$(LIB_PREFIX)icui18n*.$(SHRLIB_FOREIGN_EXT) -- - # Shared library name for usage inside of the UDF - IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT) - LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName) Property changes on: head/databases/firebird25-server/files/patch-builds-posix_make.defaults ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/firebird25-server/files/patch-builds_posix_make.defaults =================================================================== --- head/databases/firebird25-server/files/patch-builds_posix_make.defaults (nonexistent) +++ head/databases/firebird25-server/files/patch-builds_posix_make.defaults (revision 398897) @@ -0,0 +1,38 @@ +--- builds/posix/make.defaults.orig 2015-03-27 13:46:38 UTC ++++ builds/posix/make.defaults +@@ -126,7 +126,7 @@ RM_R= rm -rf + CHMOD= chmod + CHMOD_6= chmod 666 + CHMOD_7= chmod 777 +-CHMOD_S7= chmod 06777 ++CHMOD_S7= chmod 04555 + MV= mv -f + TOUCH= touch + CP= cp +@@ -152,7 +152,7 @@ EXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFL + STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFLAGS) + + LINK_LIBS = @LIBS@ +-ICU_LIBS = -licuuc -licudata -licui18n ++ICU_LIBS = $(shell icu-config --ldflags) + STATICLINK_LIBS = @LIBS@ + SO_LINK_LIBS = @LIBS@ + +@@ -223,16 +223,12 @@ LIBFBSTATIC_A = $(LIB)/libfbstatic.a + + ifeq ($(EDITLINE_FLG),Y) + ifeq ($(STD_EDITLINE), true) +- LIBEDITLINE := -l$(READLINE) ++ LIBEDITLINE := $(shell pkgconf libedit --libs) + else + LIBEDITLINE := $(LIB)/libedit.a + endif + endif + +-LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \ +- $(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \ +- $(LIB)/$(LIB_PREFIX)icui18n*.$(SHRLIB_FOREIGN_EXT) +- + # Shared library name for usage inside of the UDF + IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT) + LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName) Property changes on: head/databases/firebird25-server/files/patch-builds_posix_make.defaults ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/firebird25-server/files/patch-builds_posix_make.rules =================================================================== --- head/databases/firebird25-server/files/patch-builds_posix_make.rules (nonexistent) +++ head/databases/firebird25-server/files/patch-builds_posix_make.rules (revision 398897) @@ -0,0 +1,11 @@ +--- builds/posix/make.rules.orig 2015-03-27 13:46:38 UTC ++++ builds/posix/make.rules +@@ -37,6 +37,8 @@ WFLAGS:=$(CPPFLAGS) -I$(SRC_ROOT)/includ + + ifeq ($(STD_ICU),false) + WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n ++else ++ WFLAGS:= $(WFLAGS) $(shell icu-config --cppflags) + endif + + ifeq ($(IsProdTypeBuild),Y) Property changes on: head/databases/firebird25-server/files/patch-builds_posix_make.rules ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property