CVS commit: pkgsrc/devel/poco

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr  8 08:21:58 UTC 2021

Modified Files:
        pkgsrc/devel/poco: Makefile distinfo
        pkgsrc/devel/poco/patches: patch-ae

Log Message:
poco: honor CFLAGS and LDFLAGS

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/poco/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/poco/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/poco/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/poco/Makefile
diff -u pkgsrc/devel/poco/Makefile:1.13 pkgsrc/devel/poco/Makefile:1.14
--- pkgsrc/devel/poco/Makefile:1.13     Sat Jan 18 21:48:09 2020
+++ pkgsrc/devel/poco/Makefile  Thu Apr  8 08:21:58 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 21:48:09 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.14 2021/04/08 08:21:58 wiz Exp $
 
 PKGNAME=       poco-${POCO_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 
 COMMENT=       POCO C++ Foundation libraries
@@ -20,6 +19,7 @@ CONFIGURE_ARGS+=      --include-path=${BUILDL
 CONFIGURE_ARGS+=       --include-path=${BUILDLINK_PREFIX.openssl}/include
 
 # remove patch backup files.
+# XXX: this should delete in post-install ${DESTDIR}${PREFIX} instead
 pre-install:
        ${RM} -f ${WRKSRC}/Foundation/include/Poco/Platform.h.orig
 

Index: pkgsrc/devel/poco/distinfo
diff -u pkgsrc/devel/poco/distinfo:1.14 pkgsrc/devel/poco/distinfo:1.15
--- pkgsrc/devel/poco/distinfo:1.14     Fri Mar 27 02:08:11 2020
+++ pkgsrc/devel/poco/distinfo  Thu Apr  8 08:21:58 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2020/03/27 02:08:11 joerg Exp $
+$NetBSD: distinfo,v 1.15 2021/04/08 08:21:58 wiz Exp $
 
 SHA1 (poco-1.6.1-all.tar.gz) = 38841212a6893d4290909a62b4f310450230fb6d
 RMD160 (poco-1.6.1-all.tar.gz) = a7ab9429db5b4b5fc02c194a208f11f296deb90b
@@ -19,7 +19,7 @@ SHA1 (patch-aa) = be1c72c9c63b65e8d4211a
 SHA1 (patch-ab) = a5ebcc44e9ab728d9812cefd01188622bfea172f
 SHA1 (patch-ac) = 08fa398b76935082dccbfb81bb69877d10996f6f
 SHA1 (patch-ad) = f6eeb9dc9b3a85525f264edbd1587bc4f124b9e1
-SHA1 (patch-ae) = d168bd1e391992b64555373065fb431ad9c23731
+SHA1 (patch-ae) = 79f9ab433e87a5518efe51133877e7e9f25b0bf1
 SHA1 (patch-ag) = e1ef2677c25d445cdae97c832211e2407fae9af3
 SHA1 (patch-ah) = a4ba890ab2501552bf18b2778f3f3593e4b0abcb
 SHA1 (patch-build_config_Linux) = f1b4eb600a472dfe9dca8d61e9c6ac3c5e4f2f9d

Index: pkgsrc/devel/poco/patches/patch-ae
diff -u pkgsrc/devel/poco/patches/patch-ae:1.2 pkgsrc/devel/poco/patches/patch-ae:1.3
--- pkgsrc/devel/poco/patches/patch-ae:1.2      Mon Jan 18 20:46:52 2016
+++ pkgsrc/devel/poco/patches/patch-ae  Thu Apr  8 08:21:58 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.2 2016/01/18 20:46:52 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2021/04/08 08:21:58 wiz Exp $
 
 # clean up the FreeBSD configuration to fit better with pkgsrc
 
 # Build a full set of shared library search paths, rather than
 # *assuming* everything is under PREFIX.
 
---- build/config/FreeBSD.orig  2010-12-16 05:43:24.000000000 +0000
+--- build/config/FreeBSD.orig  2015-08-04 05:20:55.000000000 +0000
 +++ build/config/FreeBSD
 @@ -20,7 +20,9 @@ CXX     = g++
  LINK    = $(CXX)
@@ -14,10 +14,26 @@ $NetBSD: patch-ae,v 1.2 2016/01/18 20:46
 -SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 +SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-rpath,$(POCO_PREFIX)/lib \
 +              $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p))
-+SHLIB   = $(CXX) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@
++SHLIB   = $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@
  SHLIBLN = $(POCO_BASE)/build/script/shlibln
  DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
  STRIP   = strip
+@@ -38,13 +40,13 @@ SHAREDLIBLINKEXT = .so
+ #
+ # Compiler and Linker Flags
+ #
+-CFLAGS          = 
++CFLAGS          ?= 
+ CFLAGS32        =
+ CFLAGS64        =
+ CXXFLAGS        =
+ CXXFLAGS32      =
+ CXXFLAGS64      =
+-LINKFLAGS       =
++LINKFLAGS       = ${LDFLAGS}
+ LINKFLAGS32     =
+ LINKFLAGS64     =
+ STATICOPT_CC    =
 @@ -52,7 +54,7 @@ STATICOPT_CXX   =
  STATICOPT_LINK  = -static
  SHAREDOPT_CC    = -fPIC