cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to distcc-3.3.3, sync WANTLIB, update HOMEPAGE, install the

Browse Source 
update-distcc-symlinks script which works ok as long as you have the
-main subpackage installed, move --daemon from daemon_flags in the
rc script to daemon.
This commit is contained in:
sthen 2020-06-12 14:19:11 +00:00
parent d42d88218e
commit 3beba617d5
8 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devel/distcc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:44:08 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2020/06/12 14:19:11 sthen Exp $
COMMENT-main = distributed builds for C, C++ and Objective C
COMMENT-gtk = GTK+ monitor for distcc
@ -6,18 +6,15 @@ COMMENT-server = distcc server
GH_PROJECT = distcc
GH_ACCOUNT = distcc
VERSION = 3.3
VERSION = 3.3.3
DISTNAME = distcc-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gtk = distcc-gtk-${VERSION}
PKGNAME-server = distcc-server-${VERSION}
EPOCH = 0
CATEGORIES = devel net
REVISION-gtk = 2
REVISION-main = 1
REVISION-server = 1
HOMEPAGE = https://github.com/distcc/distcc
HOMEPAGE = https://distcc.github.io/
# GPLv2
PERMIT_PACKAGE = Yes
@ -28,6 +25,7 @@ MULTI_PACKAGES = -main -gtk -server
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_EGG_VERSION = ${VERSION}
# Only -main needs an RDEP
MODPY_RUNDEP = No
@ -48,7 +46,8 @@ RUN_DEPENDS-gtk = devel/desktop-file-utils
WANTLIB-gtk += ${WANTLIB} X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB-gtk += Xinerama Xrandr Xrender atk-1.0 cairo fontconfig freetype
WANTLIB-gtk += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB-gtk += gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z
WANTLIB-gtk += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
WANTLIB-gtk += pangoft2-1.0 z
USE_GMAKE = Yes
@ -61,16 +60,13 @@ CONFIGURE_ARGS += --without-libiberty \
FAKE_FLAGS = sysconfdir="${PREFIX}/share/examples/"
# Fix-up path
pre-configure:
sed -i 's,/usr/lib/distcc,${PREFIX}/lib/distcc,g' \
${WRKSRC}/man/distcc.1 \
${WRKSRC}/man/distccd.1 \
${WRKSRC}/src/daemon.c \
${WRKSRC}/src/serve.c
cd ${WRKSRC} && sed -i -E \
-e 's,/usr/(bin|lib)/distcc,${PREFIX}/\1/distcc,g' \
man/distcc.1 man/distccd.1 update-distcc-symlinks.py \
src/daemon.c src/serve.c
post-install:
rm -r ${PREFIX}/share/examples/default
rm ${PREFIX}/sbin/update-distcc-symlinks
.include <bsd.port.mk>

4
devel/distcc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (distcc-3.3.tar.gz) = EliX+Eiy3ADL22LPnmGKXpQut9cDUKK3tm50HPMgAEU=
SIZE (distcc-3.3.tar.gz) = 1171281
SHA256 (distcc-3.3.3.tar.gz) = vq0lRx1aU+z9+PBlpv5IkBwU1QCJVsMYxwDla8h78Lw=
SIZE (distcc-3.3.3.tar.gz) = 1195666

8
devel/distcc/patches/patch-Makefile_in
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-Makefile_in,v 1.2 2018/04/26 16:25:15 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2020/06/12 14:19:11 sthen Exp $
Don't install gzip'd manpages
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -1104,16 +1104,8 @@ install-include-server: include-server pump
@@ -1101,16 +1101,7 @@ install-include-server: include-server pump
install-man: $(man1_MEN)
$(mkinstalldirs) "$(DESTDIR)$(man1dir)"
for p in $(man1_MEN); do \
- if $(GZIP_BIN) --help >/dev/null; then \
- if $(GZIP_BIN) --help >/dev/null 2>&1; then \
- mkdir -p "`dirname $$p`"; \
- if [ -e "$(DESTDIR)$(man1dir)$$p" ]; then rm -fv "$(DESTDIR)$(man1dir)$$p"; fi; \
- $(GZIP_BIN) < "$(srcdir)/$$p" > "$$p.gz"; \
- $(INSTALL_DATA) "$$p.gz" "$(DESTDIR)$(man1dir)" || exit 1; \
- else \
- echo "Warning: no working gzip, installing man pages uncompressed" 1>&2; \
if [ -e "$(DESTDIR)$(man1dir)$$p.gz" ]; then rm -fv "$(DESTDIR)$(man1dir)$$p.gz"; fi; \
- if [ -e "$(DESTDIR)$(man1dir)$$p.gz" ]; then rm -fv "$(DESTDIR)$(man1dir)$$p.gz"; fi; \
$(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(man1dir)" || exit 1; \
- fi; \
done

7
devel/distcc/pkg/PLIST-main
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.3 2018/09/04 12:46:10 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2020/06/12 14:19:11 sthen Exp $
@bin bin/distcc
@bin bin/distccmon-text
@bin bin/lsdistcc
bin/pump
lib/python${MODPY_VERSION}/site-packages/include_server/
lib/python${MODPY_VERSION}/site-packages/include_server${MODPY_BIN_SUFFIX}.3-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/include_server-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/include_server/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/include_server/${MODPY_PYCACHE}basics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/include_server/${MODPY_PYCACHE}basics_test.${MODPY_PYC_MAGIC_TAG}pyc
@ -35,7 +35,7 @@ lib/python${MODPY_VERSION}/site-packages/include_server/c_extensions_test.py
lib/python${MODPY_VERSION}/site-packages/include_server/cache_basics.py
lib/python${MODPY_VERSION}/site-packages/include_server/compiler_defaults.py
lib/python${MODPY_VERSION}/site-packages/include_server/compress_files.py
lib/python${MODPY_VERSION}/site-packages/include_server/distcc_pump_c_extensions.so
@so lib/python${MODPY_VERSION}/site-packages/include_server/distcc_pump_c_extensions.so
lib/python${MODPY_VERSION}/site-packages/include_server/include_analyzer.py
lib/python${MODPY_VERSION}/site-packages/include_server/include_analyzer_memoizing_node.py
lib/python${MODPY_VERSION}/site-packages/include_server/include_analyzer_memoizing_node_test.py
@ -58,6 +58,7 @@ lib/python${MODPY_VERSION}/site-packages/include_server/statistics.py
@man man/man1/include_server.1
@man man/man1/lsdistcc.1
@man man/man1/pump.1
sbin/update-distcc-symlinks
share/doc/distcc/
share/doc/distcc/AUTHORS
share/doc/distcc/COPYING

4
devel/distcc/pkg/PLIST-server
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-server,v 1.2 2018/09/04 12:46:10 espie Exp $
@comment $OpenBSD: PLIST-server,v 1.3 2020/06/12 14:19:11 sthen Exp $
@newgroup _distcc:764
@newuser _distcc:764:_distcc:daemon:distcc user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/distccd
@bin bin/distccd
@man man/man1/distccd.1
share/doc/pkg-readmes/${PKGSTEM}
@rcscript ${RCDIR}/distccd

4
devel/distcc/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.4 2018/09/04 12:46:10 espie Exp $
$OpenBSD: README-main,v 1.5 2020/06/12 14:19:11 sthen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
@ -25,8 +25,6 @@ This feature is called masquerading and it's enabled by default. See
the MASQUERADING section in distcc(1) how to set this up.
If you wish to disable it and fallback to the old behaviour, use the
`--make-me-a-botnet` parameter for distccd.
Note, update-distcc-symlinks is not included in the package as it's
not adjusted yet to handle the different compilers on OpenBSD.
References
==========

10
devel/distcc/pkg/README-server
View File

@ -1,4 +1,4 @@
$OpenBSD: README-server,v 1.2 2018/09/04 12:46:10 espie Exp $
$OpenBSD: README-server,v 1.3 2020/06/12 14:19:11 sthen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
@ -9,5 +9,9 @@ distccd
distcc can run over TCP or SSH. For TCP connections the `distccd`
daemon has to be running on the remote hosts. Jobs will run by default
as the unprivileged `_distcc` user. In order to allow incoming
connections to a "worker", one has to modify `distccd_flags` to
reflect the address/subnet of originating connections.
connections to a "worker", one has to modify distccd flags to
reflect the address/subnet of originating connections:
# rcctl enable distccd
# rcctl set distccd flags --allow 192.168.50.0/24
# rcctl start distccd

6
devel/distcc/pkg/distccd.rc
View File

@ -1,10 +1,10 @@
#!/bin/ksh
#
# $OpenBSD: distccd.rc,v 1.3 2018/04/26 16:25:15 jasper Exp $
# $OpenBSD: distccd.rc,v 1.4 2020/06/12 14:19:11 sthen Exp $
daemon="${PREFIX}/bin/distccd"
daemon="${PREFIX}/bin/distccd --daemon"
daemon_user="_distcc"
daemon_flags="--daemon --allow 127.0.0.1"
daemon_flags="--allow 127.0.0.1"
. /etc/rc.d/rc.subr