Date: Thu, 8 Oct 2015 23:14:19 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398897 - in head/databases/firebird25-server: . files Message-ID: <201510082314.t98NEJJJ045966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Oct 8 23:14:18 2015 New Revision: 398897 URL: https://svnweb.freebsd.org/changeset/ports/398897 Log: Fix dependencies and add LICENSE. Added: head/databases/firebird25-server/files/patch-builds_posix_make.defaults - copied, changed from r398833, head/databases/firebird25-server/files/patch-builds-posix_make.defaults head/databases/firebird25-server/files/patch-builds_posix_make.rules (contents, props changed) Deleted: head/databases/firebird25-server/files/patch-builds-posix_make.defaults Modified: head/databases/firebird25-server/Makefile Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Thu Oct 8 22:15:10 2015 (r398896) +++ head/databases/firebird25-server/Makefile Thu Oct 8 23:14:18 2015 (r398897) @@ -3,6 +3,7 @@ PORTNAME= firebird PORTVERSION= 2.5.4 +PORTREVISION= 1 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server @@ -12,6 +13,15 @@ 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-* \ @@ -19,7 +29,7 @@ CONFLICTS?= ${PORTNAME}20-client-* \ LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu -USES= bison tar:bzip2 gmake +USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes @@ -37,10 +47,10 @@ CONFIGURE_ARGS= --with-system-editline \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ --with-fbudf=${LIBEXECDIR}/UDF -CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +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" LOCALSTATEDIR= /var/db/firebird CONFDIR= etc/firebird @@ -69,6 +79,7 @@ IGNORE= your system does not support sy .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 @@ -87,11 +98,11 @@ UDF_SQL= src/extlib/ib_udf2.sql src/extl 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 @@ -107,9 +118,6 @@ FB_DOCS_DIRS= sql.extensions license upg 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 \ Copied and modified: head/databases/firebird25-server/files/patch-builds_posix_make.defaults (from r398833, head/databases/firebird25-server/files/patch-builds-posix_make.defaults) ============================================================================== --- head/databases/firebird25-server/files/patch-builds-posix_make.defaults Thu Oct 8 15:12:22 2015 (r398833, copy source) +++ head/databases/firebird25-server/files/patch-builds_posix_make.defaults Thu Oct 8 23:14:18 2015 (r398897) @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 @@ -9,16 +9,23 @@ MV= mv -f TOUCH= touch CP= cp -@@ -153,7 +153,7 @@ - STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) +@@ -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 = `icu-config --ldflags-libsonly` `icu-config --ldflags-searchpath` ++ICU_LIBS = $(shell icu-config --ldflags) STATICLINK_LIBS = @LIBS@ SO_LINK_LIBS = @LIBS@ -@@ -230,10 +230,6 @@ +@@ -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 Added: head/databases/firebird25-server/files/patch-builds_posix_make.rules ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/firebird25-server/files/patch-builds_posix_make.rules Thu Oct 8 23:14:18 2015 (r398897) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510082314.t98NEJJJ045966>