Date: Fri, 19 Jul 2013 15:16:32 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323304 - in head/sysutils/ucspi-unix: . files Message-ID: <201307191516.r6JFGWLX022687@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Jul 19 15:16:31 2013 New Revision: 323304 URL: http://svnweb.freebsd.org/changeset/ports/323304 Log: - Trim Makefile header, define LICENSE (GPLv2) - Try to fix parallel builds by coalescing build commands - Silence the patching routine - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS - Retouch COMMENT and port description: s/UNIX/Unix/ Reported by: pointyhat-west Added: head/sysutils/ucspi-unix/files/ head/sysutils/ucspi-unix/files/patch-Makefile (contents, props changed) Modified: head/sysutils/ucspi-unix/Makefile head/sysutils/ucspi-unix/pkg-descr Modified: head/sysutils/ucspi-unix/Makefile ============================================================================== --- head/sysutils/ucspi-unix/Makefile Fri Jul 19 15:15:47 2013 (r323303) +++ head/sysutils/ucspi-unix/Makefile Fri Jul 19 15:16:31 2013 (r323304) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ucspi-unix -# Date created: 23.Sep.2003 -# Whom: patrick@rinke-bochum.de -# +# Created by: Patrick Rinke <patrick@rinke-bochum.de> # $FreeBSD$ -# PORTNAME= ucspi-unix PORTVERSION= 0.36 @@ -12,7 +8,9 @@ CATEGORIES= sysutils MASTER_SITES= http://untroubled.org/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org -COMMENT= UNIX-domain socket client-server command-line tools +COMMENT= Unix-domain socket client-server command-line tools + +LICENSE= GPLv2 BUILD_DEPENDS= ${BGLIBS_LIB}/libbg.a:${PORTSDIR}/devel/bglibs @@ -25,7 +23,11 @@ PLIST_FILES= bin/unixcat bin/unixclient MAN1= unixclient.1 unixserver.1 PORTDOCS= NEWS PROTOCOL README TODO -post-patch: +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +post-patch: .SILENT ${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home ${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin ${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man @@ -36,11 +38,9 @@ post-patch: do-install: cd ${WRKSRC} && ./installer - -.if !defined(NOPORTDOCS) -post-install: +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif .include <bsd.port.mk> Added: head/sysutils/ucspi-unix/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ucspi-unix/files/patch-Makefile Fri Jul 19 15:16:31 2013 (r323304) @@ -0,0 +1,56 @@ +--- Makefile.orig 2002-06-11 05:12:06.000000000 +0800 ++++ Makefile 2013-07-19 22:55:35.000000000 +0800 +@@ -19,8 +19,7 @@ + echo 'source=$$1; shift'; \ + echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \ + echo exec `head -1 conf-cc` '-I. -o $${base}.o -c $$source $${1+"$$@"}'; \ +- ) >compile +- chmod 755 compile ++ ) >compile && chmod 755 compile + + conf_bin.c: conf-bin + head -1 conf-bin | \ +@@ -38,37 +37,31 @@ + ./compile env.c + + installer: load insthier.o +- ./load insthier -linstaller +- mv insthier installer ++ ./load insthier -linstaller && mv insthier installer + + instcheck: load insthier.o +- ./load insthier -linstcheck +- mv insthier instcheck ++ ./load insthier -linstcheck && mv insthier instcheck + + insthier.o: compile insthier.c conf_bin.c conf_man.c + ./compile insthier.c + + instshow: load insthier.o +- ./load insthier -linstshow +- mv insthier instshow ++ ./load insthier -linstshow && mv insthier instshow + + load: conf-ld + ( echo '#!/bin/sh';\ + echo 'main="$$1"; shift';\ + echo exec `head -1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\ +- ) >load +- chmod 755 load ++ ) >load && chmod 755 load + + programs: unixclient unixserver unixcat + + socket.lib: compile load trylib.c + ( ( ./compile trylib.c && ./load trylib -lsocket -lnsl ) >/dev/null 2>&1 \ +- && echo -lsocket -lnsl || exit 0 ) >socket.lib +- rm -f trylib.o trylib ++ && echo -lsocket -lnsl || exit 0 ) >socket.lib && rm -f trylib.o trylib + + unixcat: warn-auto.sh unixcat.sh +- cat warn-auto.sh unixcat.sh >unixcat +- chmod 755 unixcat ++ cat warn-auto.sh unixcat.sh >unixcat && chmod 755 unixcat + + unixclient: load unixclient.o env.o utoa.o socket.lib + ./load unixclient env.o utoa.o `cat socket.lib` Modified: head/sysutils/ucspi-unix/pkg-descr ============================================================================== --- head/sysutils/ucspi-unix/pkg-descr Fri Jul 19 15:15:47 2013 (r323303) +++ head/sysutils/ucspi-unix/pkg-descr Fri Jul 19 15:16:31 2013 (r323304) @@ -1,4 +1,4 @@ -UNIX domain socket client and server programs that conform to UCSPI, -the UNIX Client-Server Program Interface. +Unix domain socket client and server programs that conform to UCSPI, the +Unix Client-Server Program Interface. WWW: http://untroubled.org/ucspi-unix/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307191516.r6JFGWLX022687>