From owner-svn-ports-all@FreeBSD.ORG Sat Nov 16 13:25:22 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 429E07E7; Sat, 16 Nov 2013 13:25:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 30DC220F9; Sat, 16 Nov 2013 13:25:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGDPMAD014289; Sat, 16 Nov 2013 13:25:22 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGDPJwS014277; Sat, 16 Nov 2013 13:25:19 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201311161325.rAGDPJwS014277@svn.freebsd.org> From: "Vanilla I. Shu" Date: Sat, 16 Nov 2013 13:25:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333992 - in head/sysutils: tcplist tcplist/files tentakel thefish throttle titlefix tm tty-clock X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 13:25:22 -0000 Author: vanilla Date: Sat Nov 16 13:25:19 2013 New Revision: 333992 URL: http://svnweb.freebsd.org/changeset/ports/333992 Log: Support STAGEDIR. Added: head/sysutils/titlefix/pkg-plist (contents, props changed) head/sysutils/tm/pkg-plist (contents, props changed) Modified: head/sysutils/tcplist/Makefile head/sysutils/tcplist/files/patch-01 head/sysutils/tcplist/pkg-plist (contents, props changed) head/sysutils/tentakel/Makefile head/sysutils/tentakel/pkg-plist head/sysutils/thefish/Makefile head/sysutils/throttle/Makefile head/sysutils/titlefix/Makefile head/sysutils/tm/Makefile head/sysutils/tty-clock/Makefile Modified: head/sysutils/tcplist/Makefile ============================================================================== --- head/sysutils/tcplist/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tcplist/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -18,7 +18,5 @@ EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= |sh NO_WRKSUBDIR= yes INSTALL_TARGET= install install.man -MAN1= tcplist.1 -NO_STAGE= yes .include Modified: head/sysutils/tcplist/files/patch-01 ============================================================================== --- head/sysutils/tcplist/files/patch-01 Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tcplist/files/patch-01 Sat Nov 16 13:25:19 2013 (r333992) @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Apr 24 09:33:17 1997 -+++ Makefile Thu Apr 24 10:02:39 1997 +--- Makefile.orig 2013-11-16 20:34:19.000000000 +0800 ++++ Makefile 2013-11-16 20:35:17.000000000 +0800 @@ -1,14 +1,16 @@ # Compiler: eg. cc or gcc CC = cc @@ -20,7 +20,7 @@ # Owner of tcplist executable OWNER = root -@@ -45,18 +47,18 @@ +@@ -45,18 +47,18 @@ MANEXT = 1 # # Solaris 2.x (using LSOF): # @@ -47,7 +47,7 @@ # # If you're using an old version of lsof, uncomment this: -@@ -76,8 +78,8 @@ +@@ -76,8 +78,8 @@ OBJS = $(SRCS:.c=.o) RM = /bin/rm -rf CP = /bin/cp CHMOD = /bin/chmod @@ -58,3 +58,22 @@ all:: tcplist +@@ -95,13 +97,13 @@ depend: + + install: tcplist + strip tcplist +- $(CP) tcplist $(BINDIR) +- $(CHGRP) $(GROUP) $(BINDIR)/tcplist +- $(CHMOD) $(MODE) $(BINDIR)/tcplist ++ $(CP) tcplist $(DESTDIR)$(BINDIR) ++ $(CHGRP) $(GROUP) $(DESTDIR)$(BINDIR)/tcplist ++ $(CHMOD) $(MODE) $(DESTDIR)$(BINDIR)/tcplist + + install.man: tcplist.1 +- $(CP) tcplist.1 $(MANDIR)/tcplist.$(MANEXT) +- $(CHMOD) $(MANMODE) $(MANDIR)/tcplist.$(MANEXT) ++ $(CP) tcplist.1 $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) ++ $(CHMOD) $(MANMODE) $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) + + shar: + shar `awk '{print $$1}' MANIFEST` >tcplist-`awk '{print $$7;exit}' patchlevel.h`.shar Modified: head/sysutils/tcplist/pkg-plist ============================================================================== --- head/sysutils/tcplist/pkg-plist Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tcplist/pkg-plist Sat Nov 16 13:25:19 2013 (r333992) @@ -1,2 +1,2 @@ -@comment $FreeBSD$ bin/tcplist +man/man1/tcplist.1.gz Modified: head/sysutils/tentakel/Makefile ============================================================================== --- head/sysutils/tentakel/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tentakel/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -15,7 +15,4 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/py USE_PYTHON= yes USE_PYDISTUTILS= yes -MAN1= tentakel.1 - -NO_STAGE= yes .include Modified: head/sysutils/tentakel/pkg-plist ============================================================================== --- head/sysutils/tentakel/pkg-plist Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tentakel/pkg-plist Sat Nov 16 13:25:19 2013 (r333992) @@ -26,11 +26,12 @@ bin/tentakel %%PYTHON_SITELIBDIR%%/lekatnet/tpg.py %%PYTHON_SITELIBDIR%%/lekatnet/tpg.pyc %%PYTHON_SITELIBDIR%%/lekatnet/tpg.pyo -%%DOCSDIR%%/PLUGINS -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%DOCSDIR%%/tentakel.1.html -%%DOCSDIR%%/tentakel.conf.example -@dirrm %%DOCSDIR%% +man/man1/tentakel.1.gz +%%PORTDOCS%%%%DOCSDIR%%/PLUGINS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/tentakel.1.html +%%PORTDOCS%%%%DOCSDIR%%/tentakel.conf.example +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/lekatnet/plugins @dirrm %%PYTHON_SITELIBDIR%%/lekatnet Modified: head/sysutils/thefish/Makefile ============================================================================== --- head/sysutils/thefish/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/thefish/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -18,7 +18,6 @@ WANT_GNOME= yes #OPTIONS_SINGLE_X11= GTK2 #OPTIONS_DEFAULT= GTK2 -NO_STAGE= yes .include #.if ${PORT_OPTIONS:MGTK2} @@ -26,11 +25,10 @@ USE_GNOME= gtk20 MAKE_ENV+= WITH_GTK=yes #.endif -MAN1= thefish.1 -PLIST_FILES= bin/thefish +PLIST_FILES= bin/thefish man/man1/thefish.1.gz do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/thefish ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/thefish.1 ${PREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/thefish.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/sysutils/throttle/Makefile ============================================================================== --- head/sysutils/throttle/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/throttle/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -11,8 +11,6 @@ COMMENT= A pipe bandwidth throttling uti GNU_CONFIGURE= yes -MAN1= throttle.1 -PLIST_FILES= bin/throttle +PLIST_FILES= bin/throttle man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include Modified: head/sysutils/titlefix/Makefile ============================================================================== --- head/sysutils/titlefix/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/titlefix/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -14,13 +14,12 @@ RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3 USES= perl5 USE_PERL5= run NO_BUILD= yes -MAN1= titlefix.1 titlefixid3.1 titleid3.1 -PLIST_FILES= bin/titlefix bin/titlefixid3 bin/titleid3 +MAN1S= titlefix.1 titlefixid3.1 titleid3.1 -NO_STAGE= yes do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ - @${LN} -sf ${PREFIX}/bin/${PORTNAME} ${PREFIX}/bin/titlefixid3 - @${LN} -sf ${PREFIX}/bin/${PORTNAME} ${PREFIX}/bin/titleid3 - @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man1/,} ${MAN1PREFIX}/man/man1/ + @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf ${PORTNAME} titlefixid3 + @cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf ${PORTNAME} titleid3 + @${INSTALL_MAN} ${MAN1S:S,^,${WRKSRC}/man1/,} ${STAGEDIR}${MAN1PREFIX}/man/man1/ + .include Added: head/sysutils/titlefix/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/titlefix/pkg-plist Sat Nov 16 13:25:19 2013 (r333992) @@ -0,0 +1,6 @@ +bin/titlefix +bin/titlefixid3 +bin/titleid3 +man/man1/titlefix.1.gz +man/man1/titlefixid3.1.gz +man/man1/titleid3.1.gz Modified: head/sysutils/tm/Makefile ============================================================================== --- head/sysutils/tm/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tm/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -12,13 +12,11 @@ COMMENT= Terminal mixer LICENSE= GPLv2 -PLIST_FILES= bin/${PORTNAME} -PORTDOCS= ChangeLog DOCS index.html +DOCS= ChangeLog DOCS index.html MAKE_ENV= LINUX_LIBS=-lutil OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-extract: @${MV} ${WRKSRC}/web/index.html ${WRKSRC}/ @@ -31,10 +29,8 @@ post-patch: .include do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Added: head/sysutils/tm/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tm/pkg-plist Sat Nov 16 13:25:19 2013 (r333992) @@ -0,0 +1,5 @@ +bin/tm +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/DOCS +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/sysutils/tty-clock/Makefile ============================================================================== --- head/sysutils/tty-clock/Makefile Sat Nov 16 12:54:17 2013 (r333991) +++ head/sysutils/tty-clock/Makefile Sat Nov 16 13:25:19 2013 (r333992) @@ -1,22 +1,21 @@ # Created by: Eric Freeman # $FreeBSD$ -PORTNAME= tty-clock -PORTVERSION= 2.0.0 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= http://github.com/xorg62/${PORTNAME}/tarball/ -DISTNAME= a82fd71 -EXTRACT_SUFX= # none - -MAINTAINER= ports@FreeBSD.org -COMMENT= Terminal based clock - -FETCH_ARGS= -pRr -WRKSRC= "${WRKDIR}/xorg62-${PORTNAME}-${DISTNAME}" -PLIST_FILES= bin/tty-clock +PORTNAME= tty-clock +PORTVERSION= 2.0.0 +PORTREVISION= 1 +CATEGORIES= sysutils +MASTER_SITES= http://github.com/xorg62/${PORTNAME}/tarball/ +DISTNAME= a82fd71 +EXTRACT_SUFX= # none + +MAINTAINER= ports@FreeBSD.org +COMMENT= Terminal based clock + +FETCH_ARGS= -pRr +WRKSRC= "${WRKDIR}/xorg62-${PORTNAME}-${DISTNAME}" +PLIST_FILES= bin/tty-clock -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS \+=|' ${WRKSRC}/Makefile @@ -26,6 +25,6 @@ do-build: cd ${WRKSRC} && ${MAKE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tty-clock ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tty-clock ${STAGEDIR}${PREFIX}/bin .include