Date: Sun, 15 Nov 2015 11:10:26 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401689 - in head: devel/subversion security/subversion-gnome-keyring security/subversion-kwallet Message-ID: <201511151110.tAFBAQw1012505@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Sun Nov 15 11:10:26 2015 New Revision: 401689 URL: https://svnweb.freebsd.org/changeset/ports/401689 Log: (1) Place pkgconfig files to proper directory (libdata) (2) Strip binaries and libraries if MAINTAINER_DEBUG is not set (3) Set WITH_DEBUG if MAINTAINER_DEBUG option is selected PR: 204496 Submitted by: Dmitry Marakasov <amdmi3@FreeBSD.org> Modified: head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/pkg-plist head/security/subversion-gnome-keyring/Makefile head/security/subversion-gnome-keyring/pkg-plist head/security/subversion-kwallet/Makefile head/security/subversion-kwallet/pkg-plist Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Sun Nov 15 11:07:18 2015 (r401688) +++ head/devel/subversion/Makefile Sun Nov 15 11:10:26 2015 (r401689) @@ -152,23 +152,26 @@ test: build -@make check -C ${WRKSRC} .endif -post-build: -.if ${PORT_OPTIONS:MTOOLS} +post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} -.endif post-install: ${MKREPOS_TARGET} -.if ${PORT_OPTIONS:MTOOLS} - @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} -.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +post-install-STATIC-off: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample +post-install-TOOLS-on: + @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + # =============================================================================== repository: _mkrepos Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Sun Nov 15 11:07:18 2015 (r401688) +++ head/devel/subversion/Makefile.common Sun Nov 15 11:10:26 2015 (r401689) @@ -9,10 +9,9 @@ MASTER_SITES= APACHE/subversion DIST_SUBDIR= subversion19 GNU_CONFIGURE= yes -USES+= cpe libtool pkgconfig shebangfix tar:bzip2 +USES+= cpe libtool pathfix pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \ tools/server-side/svnpubsub/rc.d/svnwcsub.solaris -bash_OLD_CMD= /usr/bin/bash LICENSE= APACHE20 @@ -40,7 +39,6 @@ OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USE= BDB=42+ -MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug NLS_CONFIGURE_OFF= --disable-nls @@ -59,6 +57,10 @@ STATIC_CONFIGURE_ON= --enable-all-stati # =============================================================== .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} +WITH_DEBUG= yes +.endif + APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config Modified: head/devel/subversion/pkg-plist ============================================================================== --- head/devel/subversion/pkg-plist Sun Nov 15 11:07:18 2015 (r401688) +++ head/devel/subversion/pkg-plist Sun Nov 15 11:10:26 2015 (r401689) @@ -147,20 +147,20 @@ man/man8/svnserve.8.gz %%NLS%%share/locale/sv/LC_MESSAGES/subversion.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/subversion.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/subversion.mo -share/pkgconfig/libsvn_client.pc -share/pkgconfig/libsvn_delta.pc -share/pkgconfig/libsvn_diff.pc -share/pkgconfig/libsvn_fs.pc -share/pkgconfig/libsvn_fs_fs.pc -share/pkgconfig/libsvn_fs_util.pc -share/pkgconfig/libsvn_fs_x.pc -share/pkgconfig/libsvn_ra.pc -share/pkgconfig/libsvn_ra_local.pc -%%SERF%%share/pkgconfig/libsvn_ra_serf.pc -share/pkgconfig/libsvn_ra_svn.pc -share/pkgconfig/libsvn_repos.pc -share/pkgconfig/libsvn_subr.pc -share/pkgconfig/libsvn_wc.pc +libdata/pkgconfig/libsvn_client.pc +libdata/pkgconfig/libsvn_delta.pc +libdata/pkgconfig/libsvn_diff.pc +libdata/pkgconfig/libsvn_fs.pc +libdata/pkgconfig/libsvn_fs_fs.pc +libdata/pkgconfig/libsvn_fs_util.pc +libdata/pkgconfig/libsvn_fs_x.pc +libdata/pkgconfig/libsvn_ra.pc +libdata/pkgconfig/libsvn_ra_local.pc +%%SERF%%libdata/pkgconfig/libsvn_ra_serf.pc +libdata/pkgconfig/libsvn_ra_svn.pc +libdata/pkgconfig/libsvn_repos.pc +libdata/pkgconfig/libsvn_subr.pc +libdata/pkgconfig/libsvn_wc.pc %%DATADIR%%/backup/hot-backup.py %%DATADIR%%/bdb/erase-all-text-data.py %%DATADIR%%/bdb/skel.py Modified: head/security/subversion-gnome-keyring/Makefile ============================================================================== --- head/security/subversion-gnome-keyring/Makefile Sun Nov 15 11:07:18 2015 (r401688) +++ head/security/subversion-gnome-keyring/Makefile Sun Nov 15 11:10:26 2015 (r401689) @@ -31,4 +31,7 @@ CONFIGURE_ARGS+= --with-gnome-keyring ALL_TARGET= gnome-keyring-lib INSTALL_TARGET= install-gnome-keyring-lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + .include <bsd.port.post.mk> Modified: head/security/subversion-gnome-keyring/pkg-plist ============================================================================== --- head/security/subversion-gnome-keyring/pkg-plist Sun Nov 15 11:07:18 2015 (r401688) +++ head/security/subversion-gnome-keyring/pkg-plist Sun Nov 15 11:10:26 2015 (r401689) @@ -2,3 +2,4 @@ lib/libsvn_auth_gnome_keyring-1.a lib/libsvn_auth_gnome_keyring-1.so lib/libsvn_auth_gnome_keyring-1.so.0 lib/libsvn_auth_gnome_keyring-1.so.0.0.0 +libdata/pkgconfig/libsvn_auth_gnome_keyring.pc Modified: head/security/subversion-kwallet/Makefile ============================================================================== --- head/security/subversion-kwallet/Makefile Sun Nov 15 11:07:18 2015 (r401688) +++ head/security/subversion-kwallet/Makefile Sun Nov 15 11:10:26 2015 (r401689) @@ -32,4 +32,7 @@ CONFIGURE_ARGS+= --with-kwallet=${KDE4_P ALL_TARGET= kwallet-lib INSTALL_TARGET= install-kwallet-lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + .include <bsd.port.post.mk> Modified: head/security/subversion-kwallet/pkg-plist ============================================================================== --- head/security/subversion-kwallet/pkg-plist Sun Nov 15 11:07:18 2015 (r401688) +++ head/security/subversion-kwallet/pkg-plist Sun Nov 15 11:10:26 2015 (r401689) @@ -2,3 +2,4 @@ lib/libsvn_auth_kwallet-1.a lib/libsvn_auth_kwallet-1.so lib/libsvn_auth_kwallet-1.so.0 lib/libsvn_auth_kwallet-1.so.0.0.0 +libdata/pkgconfig/libsvn_auth_kwallet.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511151110.tAFBAQw1012505>