Date: Wed, 30 Jul 2014 00:48:48 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363420 - in head/devel/poco-ssl: . files Message-ID: <201407300048.s6U0mmME069804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Wed Jul 30 00:48:47 2014 New Revision: 363420 URL: http://svnweb.freebsd.org/changeset/ports/363420 QAT: https://qat.redports.org/buildarchive/r363420/ Log: - Unbreak by copying patch from poco-devel - Fix TEST and SAMPLES options - Fix plist - Strip binaries and libraries This port and devel/poco would seem to have been abandoned by the maintainer? Added: head/devel/poco-ssl/files/patch-build-config-FreeBSD - copied unchanged from r363395, head/devel/poco-devel/files/patch-build-config-FreeBSD Modified: head/devel/poco-ssl/Makefile head/devel/poco-ssl/pkg-plist Modified: head/devel/poco-ssl/Makefile ============================================================================== --- head/devel/poco-ssl/Makefile Wed Jul 30 00:15:51 2014 (r363419) +++ head/devel/poco-ssl/Makefile Wed Jul 30 00:48:47 2014 (r363420) @@ -23,7 +23,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --con USE_LDCONFIG= yes OPTIONS_DEFINE= TEST SAMPLES MYSQL SQLITE ODBC -OPTIONS_DEFAULT= MYSQL SQLITE +OPTIONS_DEFAULT=MYSQL SQLITE +OPTIONS_SUB= yes SAMPLES_DESC= Build sample programs TEST_CONFIGURE_OFF= --no-tests @@ -38,4 +39,18 @@ MYSQL_CONFIGURE_OFF= --omit=Data/MySQL SQLITE_USE= SQLITE=yes SQLITE_CONFIGURE_OFF= --omit=Data/SQLite +.include <bsd.port.options.mk> + +post-patch: +.if empty(PORT_OPTIONS:MTEST) + @${REINPLACE_CMD} -e '/^all:/s/tests//' ${WRKSRC}/Makefile +.endif +.if empty(PORT_OPTIONS:MSAMPLES) + @${REINPLACE_CMD} -e '/^all:/s/samples//' ${WRKSRC}/Makefile +.endif + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*d + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*d.so.* + .include <bsd.port.mk> Copied: head/devel/poco-ssl/files/patch-build-config-FreeBSD (from r363395, head/devel/poco-devel/files/patch-build-config-FreeBSD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/poco-ssl/files/patch-build-config-FreeBSD Wed Jul 30 00:48:47 2014 (r363420, copy of r363395, head/devel/poco-devel/files/patch-build-config-FreeBSD) @@ -0,0 +1,98 @@ +--- build/config/FreeBSD.orig 2014-04-29 20:44:44.000000000 -0700 ++++ build/config/FreeBSD 2014-04-29 20:50:10.000000000 -0700 +@@ -15,57 +15,57 @@ + # + # Define Tools + # +-CC = gcc +-CXX = g++ +-LINK = $(CXX) +-LIB = ar -cr +-RANLIB = ranlib +-SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ +-SHLIBLN = $(POCO_BASE)/build/script/shlibln +-DEP = $(POCO_BASE)/build/script/makedepend.gcc +-STRIP = strip +-SHELL = sh +-RM = rm -rf +-CP = cp +-MKDIR = mkdir -p ++CC ?= cc ++CXX ?= c++ ++LINK ?= $(CXX) ++LIB ?= ar -cr ++RANLIB ?= ranlib ++SHLIB ?= $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ ++SHLIBLN ?= $(POCO_BASE)/build/script/shlibln ++DEP ?= $(POCO_BASE)/build/script/makedepend.gcc ++STRIP ?= strip ++SHELL ?= sh ++RM ?= rm -rf ++CP ?= cp ++MKDIR ?= mkdir -p + + # + # Extension for Shared Libraries + # +-SHAREDLIBEXT = .so.$(target_version) +-SHAREDLIBLINKEXT = .so ++SHAREDLIBEXT ?= .so.$(target_version) ++SHAREDLIBLINKEXT ?= .so + + # + # Compiler and Linker Flags + # +-CFLAGS = +-CFLAGS32 = +-CFLAGS64 = +-CXXFLAGS = +-CXXFLAGS32 = +-CXXFLAGS64 = +-LINKFLAGS = +-LINKFLAGS32 = +-LINKFLAGS64 = +-STATICOPT_CC = +-STATICOPT_CXX = +-STATICOPT_LINK = -static +-SHAREDOPT_CC = -fPIC +-SHAREDOPT_CXX = -fPIC +-SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) +-DEBUGOPT_CC = -g -D_DEBUG +-DEBUGOPT_CXX = -g -D_DEBUG +-DEBUGOPT_LINK = -g +-RELEASEOPT_CC = -O2 -DNDEBUG +-RELEASEOPT_CXX = -O2 -DNDEBUG +-RELEASEOPT_LINK = -O2 ++CFLAGS ?= -I/usr/local/include ++CFLAGS32 ?= -I/usr/local/include ++CFLAGS64 ?= -I/usr/local/include ++CXXFLAGS ?= -I/usr/local/include ++CXXFLAGS32 ?= -I/usr/local/include ++CXXFLAGS64 ?= -I/usr/local/include ++LINKFLAGS ?= -L/usr/local/lib ++LINKFLAGS32 ?= ++LINKFLAGS64 ?= ++STATICOPT_CC ?= ++STATICOPT_CXX ?= ++STATICOPT_LINK ?= -static ++SHAREDOPT_CC ?= -fPIC ++SHAREDOPT_CXX ?= -fPIC ++SHAREDOPT_LINK ?= -Wl,-rpath,$(LIBPATH) ++DEBUGOPT_CC ?= -g -D_DEBUG ++DEBUGOPT_CXX ?= -g -D_DEBUG ++DEBUGOPT_LINK ?= -g ++RELEASEOPT_CC ?= -O2 -DNDEBUG ++RELEASEOPT_CXX ?= -O2 -DNDEBUG ++RELEASEOPT_LINK ?= -O2 + + # + # System Specific Flags + # +-SYSFLAGS = -D_REENTRANT -D_THREAD_SAFE ++SYSFLAGS ?= -D_REENTRANT -D_THREAD_SAFE + + # + # System Specific Libraries + # +-SYSLIBS ?= -lpthread -L /usr/local/lib ++SYSLIBS ?= -lpthread -L/usr/local/lib Modified: head/devel/poco-ssl/pkg-plist ============================================================================== --- head/devel/poco-ssl/pkg-plist Wed Jul 30 00:15:51 2014 (r363419) +++ head/devel/poco-ssl/pkg-plist Wed Jul 30 00:48:47 2014 (r363420) @@ -344,7 +344,6 @@ include/Poco/UTF8String.h include/Poco/UUID.h include/Poco/UUIDGenerator.h include/Poco/ValidArgs.h -include/Poco/._Version.h include/Poco/SAX/XMLReader.h include/Poco/SAX/AttributesImpl.h include/Poco/SAX/ContentHandler.h @@ -645,14 +644,14 @@ lib/libPocoCryptod.so lib/libPocoCryptod.so.12 lib/libPocoData.so lib/libPocoData.so.12 -lib/libPocoDataMySQL.so -lib/libPocoDataMySQL.so.12 -lib/libPocoDataMySQLd.so -lib/libPocoDataMySQLd.so.12 -lib/libPocoDataSQLite.so -lib/libPocoDataSQLite.so.12 -lib/libPocoDataSQLited.so -lib/libPocoDataSQLited.so.12 +%%MYSQL%%lib/libPocoDataMySQL.so +%%MYSQL%%lib/libPocoDataMySQL.so.12 +%%MYSQL%%lib/libPocoDataMySQLd.so +%%MYSQL%%lib/libPocoDataMySQLd.so.12 +%%SQLITE%%lib/libPocoDataSQLite.so +%%SQLITE%%lib/libPocoDataSQLite.so.12 +%%SQLITE%%lib/libPocoDataSQLited.so +%%SQLITE%%lib/libPocoDataSQLited.so.12 lib/libPocoDatad.so lib/libPocoDatad.so.12 lib/libPocoFoundation.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407300048.s6U0mmME069804>