From owner-svn-ports-all@FreeBSD.ORG Fri May 30 05:56:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E90A359; Fri, 30 May 2014 05:56:19 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5984C21A8; Fri, 30 May 2014 05:56:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U5uJRI059729; Fri, 30 May 2014 05:56:19 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U5uGY1059708; Fri, 30 May 2014 05:56:16 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201405300556.s4U5uGY1059708@svn.freebsd.org> From: Cy Schubert Date: Fri, 30 May 2014 05:56:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355791 - in head: deskutils/gdesklets mail/exmh2 mail/exmh2/scripts misc/gman net/pipsecd net/tcpview net/tcpview/files sysutils/44bsd-more sysutils/cfengine 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.18 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: Fri, 30 May 2014 05:56:19 -0000 Author: cy Date: Fri May 30 05:56:15 2014 New Revision: 355791 URL: http://svnweb.freebsd.org/changeset/ports/355791 QAT: https://qat.redports.org/buildarchive/r355791/ Log: Stagify. Modified: head/deskutils/gdesklets/Makefile head/deskutils/gdesklets/pkg-plist head/mail/exmh2/Makefile head/mail/exmh2/pkg-plist head/mail/exmh2/scripts/install head/misc/gman/Makefile head/misc/gman/pkg-plist head/net/pipsecd/Makefile head/net/pipsecd/pkg-plist head/net/tcpview/Makefile head/net/tcpview/files/patch-Makefile head/net/tcpview/pkg-plist head/sysutils/44bsd-more/Makefile head/sysutils/44bsd-more/pkg-plist head/sysutils/cfengine/Makefile Modified: head/deskutils/gdesklets/Makefile ============================================================================== --- head/deskutils/gdesklets/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/deskutils/gdesklets/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -11,26 +11,23 @@ DISTNAME= gDesklets-${PORTVERSION} MAINTAINER= cy@FreeBSD.org COMMENT= A framework for Gnome 2.x for desktop applets -USE_BZIP2= yes - LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop OPTIONS_DEFINE= GDBM WRKSRC= ${WRKDIR}/gDesklets-${PORTVERSION} -USE_GNOME= gnomehack gnomeprefix intlhack librsvg2 pygnomeextras +USE_GNOME= gnomeprefix intlhack librsvg2 pygnomeextras USE_PYTHON= yes -USES= gettext gmake pkgconfig +USES= gettext gmake pkgconfig tar:bzip2 pathfix \ + desktop-file-utils shared-mime-info libtool + GNU_CONFIGURE= yes INSTALLS_ICONS= yes -MAN1= ${PORTNAME}.1 - CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGDBM} @@ -44,11 +41,11 @@ post-patch: ${WRKSRC}/configure post-install: - @${MKDIR} ${DATADIR}/Displays - @${TOUCH} ${DATADIR}/Displays/.keep_me - @${MKDIR} ${DATADIR}/Sensors - @${TOUCH} ${DATADIR}/Sensors/.keep_me - @-update-mime-database ${PREFIX}/share/mime + @${MKDIR} ${STAGEDIR}${DATADIR}/Displays + @${TOUCH} ${STAGEDIR}${DATADIR}/Displays/.keep_me + @${MKDIR} ${STAGEDIR}${DATADIR}/Sensors + @${TOUCH} ${STAGEDIR}${DATADIR}/Sensors/.keep_me + @-update-mime-database ${STAGEDIR}${PREFIX}/share/mime @${CAT} ${PKGMESSAGE} .include Modified: head/deskutils/gdesklets/pkg-plist ============================================================================== --- head/deskutils/gdesklets/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/deskutils/gdesklets/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -430,7 +430,6 @@ lib/gdesklets/libdesklets/system/Swap.py lib/gdesklets/libdesklets/system/__init__.py lib/gdesklets/libdesklets/system/__init__.pyc lib/gdesklets/libdesklets/system/__init__.pyo -lib/gdesklets/libdesklets/system/gtop.la lib/gdesklets/libdesklets/system/gtop.so lib/gdesklets/macros/python-include.m4 lib/gdesklets/main/AboutDialog.py @@ -669,9 +668,7 @@ lib/gdesklets/utils/logger.pyo lib/gdesklets/utils/pwstore.py lib/gdesklets/utils/pwstore.pyc lib/gdesklets/utils/pwstore.pyo -lib/gdesklets/utils/svg.la lib/gdesklets/utils/svg.so -lib/gdesklets/utils/tiling.la lib/gdesklets/utils/tiling.so lib/gdesklets/utils/typeconverter.py lib/gdesklets/utils/typeconverter.pyc @@ -682,11 +679,11 @@ lib/gdesklets/utils/vfs.pyo lib/gdesklets/utils/wallpaper.py lib/gdesklets/utils/wallpaper.pyc lib/gdesklets/utils/wallpaper.pyo -lib/gdesklets/utils/x11.la lib/gdesklets/utils/x11.so lib/gdesklets/utils/xdr.py lib/gdesklets/utils/xdr.pyc lib/gdesklets/utils/xdr.pyo +man/man1/gdesklets.1.gz share/applications/gdesklets.desktop %%DATADIR%%/Displays/.keep_me %%DATADIR%%/Sensors/.keep_me @@ -736,8 +733,10 @@ share/locale/vi/LC_MESSAGES/gdesklets.mo share/locale/zh_CN/LC_MESSAGES/gdesklets.mo share/locale/zh_HK/LC_MESSAGES/gdesklets.mo share/locale/zh_TW/LC_MESSAGES/gdesklets.mo +share/mime/application/x-gdesklets-display.xml share/mime/packages/gdesklets.xml share/pixmaps/gdesklets.png +@dirrmtry share/mime/application @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/rw/LC_MESSAGES @@ -810,3 +809,4 @@ share/pixmaps/gdesklets.png @dirrm lib/gdesklets @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrmtry share/icons/gnome/48x48/mimetypes Modified: head/mail/exmh2/Makefile ============================================================================== --- head/mail/exmh2/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/mail/exmh2/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -33,7 +33,6 @@ SCRIPTS_ENV+= USE_NMH=YES # full mime support needs mmencode/mmdecode from metamail RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail -NO_STAGE= yes # Additionally, exmh will use the following ports if present: # lang/expect # textproc/glimpse @@ -45,8 +44,6 @@ NO_STAGE= yes PLIST_SUB= EXMH_VERSION=${PORTVERSION} -MAN1= exmh.1 - .if defined(JAPANESE_EXMH) do-build: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \ @@ -60,7 +57,7 @@ do-build: .endif do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \ + @cd ${WRKSRC} && ${SETENV} PREFIX=${STAGEDIR}${PREFIX} \ WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install Modified: head/mail/exmh2/pkg-plist ============================================================================== --- head/mail/exmh2/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/mail/exmh2/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -1,9 +1,15 @@ +@mode 555 +@owner bin +@group bin bin/exmh bin/exmh-async bin/exmh-bg bin/exmh-strip bin/ftp.expect bin/inc.expect +@mode 444 +@owner bin +@group bin lib/exmh-%%EXMH_VERSION%%/PgpDecryptExpect lib/exmh-%%EXMH_VERSION%%/addr.tcl lib/exmh-%%EXMH_VERSION%%/aliases.tcl @@ -219,6 +225,7 @@ lib/exmh-%%EXMH_VERSION%%/widgetText.tcl lib/exmh-%%EXMH_VERSION%%/widgets.tcl lib/exmh-%%EXMH_VERSION%%/xns.tcl lib/exmh-%%EXMH_VERSION%%/xnsgetmail.exp +man/man1/exmh.1.gz @dirrm lib/exmh-%%EXMH_VERSION%%/bitmaps @dirrm lib/exmh-%%EXMH_VERSION%%/html @dirrm lib/exmh-%%EXMH_VERSION%% Modified: head/mail/exmh2/scripts/install ============================================================================== --- head/mail/exmh2/scripts/install Fri May 30 05:55:54 2014 (r355790) +++ head/mail/exmh2/scripts/install Fri May 30 05:56:15 2014 (r355791) @@ -8,14 +8,14 @@ VERSION="`sed -ne 's/^set vers \(.*\)/\1 # Rename while installing.. for i in exmh do - echo "install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1" - install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1 + echo "install -c $i.l ${PREFIX}/man/man1/$i.1" + install -c $i.l ${PREFIX}/man/man1/$i.1 done BINS="exmh-async exmh-bg exmh-strip exmh ftp.expect inc.expect" -echo "install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin" -install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin +echo "install -c ${BINS} ${PREFIX}/bin" +install -c ${BINS} ${PREFIX}/bin if [ ! -d ${PREFIX}/lib/exmh-${VERSION} ] then @@ -25,8 +25,8 @@ fi LIBFILES='lib/*.tcl lib/*.bitmap lib/*.gif lib/*.ppm lib/help.* lib/tclIndex lib/app-defaults lib/app-defaults-* lib/*.mask lib/*.exp lib/mime.types lib/*.au lib/PgpDecryptExpect' -echo "install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}" -install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION} +echo "install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}" +install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION} if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/html ] then @@ -34,8 +34,8 @@ then mkdir ${PREFIX}/lib/exmh-${VERSION}/html fi -echo "install -c -o bin -g bin -m 444 lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html" -install -c -o bin -g bin -m 444 lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html +echo "install -c lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html" +install -c lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/bitmaps ] then @@ -43,7 +43,7 @@ then mkdir ${PREFIX}/lib/exmh-${VERSION}/bitmaps fi -echo "install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps" -install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps +echo "install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps" +install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps Modified: head/misc/gman/Makefile ============================================================================== --- head/misc/gman/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/misc/gman/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= cy@FreeBSD.org COMMENT= A user-friendly graphical front end for the man system -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ghostview:${PORTSDIR}/print/ghostview \ man2html:${PORTSDIR}/textproc/man2html @@ -26,11 +26,14 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= gettext gmake USE_GNOME= gtk12 -MAN1= gman.1x - CXXFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +.include +SHEBANG_LANG+= perlw +perlw_OLD_CMD= /usr/bin/perl -w +perlw_CMD= ${LOCALBASE}/bin/perl -w +SHEBANG_FILES= *.pl + post-patch: @${REINPLACE_CMD} -e 's,^CXX =,#CXX =,g' \ -e 's,^CXXFLAGS =,CXXFLAGS+=,g' \ @@ -40,10 +43,10 @@ post-patch: -e 's,\-lgtk \-lgdk \-lpthread ,`${GTK_CONFIG} \-\-libs gthread` ,g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gman ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/bin/gman.cgi - @${MKDIR} ${PREFIX}/www/cgi-bin - ${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin - ${INSTALL_MAN} ${WRKSRC}/gman.1x ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/gman ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${STAGEDIR}${PREFIX}/bin/gman.cgi + @${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin + ${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${STAGEDIR}${PREFIX}/www/cgi-bin + ${INSTALL_MAN} ${WRKSRC}/gman.1x ${STAGEDIR}${MANPREFIX}/man/man1 @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/misc/gman/pkg-plist ============================================================================== --- head/misc/gman/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/misc/gman/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -1,4 +1,5 @@ bin/gman bin/gman.cgi +man/man1/gman.1x.gz www/cgi-bin/gman.pl @dirrmtry www/cgi-bin Modified: head/net/pipsecd/Makefile ============================================================================== --- head/net/pipsecd/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/net/pipsecd/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -16,21 +16,20 @@ USE_OPENSSL= YES ALL_TARGET= pipsecd -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/pipsecd.sh ${PREFIX}/etc/rc.d - ${CHMOD} 755 ${PREFIX}/etc/rc.d/pipsecd.sh; - ${MKDIR} ${PREFIX}/etc/ipsec - ${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${PREFIX}/etc/ipsec + ${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/pipsecd.sh ${STAGEDIR}${PREFIX}/etc/rc.d + # ${CHMOD} 755 ${STAGEDIR}${PREFIX}/etc/rc.d/pipsecd.sh; + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ipsec + ${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${STAGEDIR}${PREFIX}/etc/ipsec .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/pipsecd - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/pipsecd - ${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/pipsecd - ${INSTALL_MAN} ${WRKSRC}/README.port ${PREFIX}/share/doc/pipsecd + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/pipsecd + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/pipsecd + ${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${PREFIX}/share/doc/pipsecd + ${INSTALL_MAN} ${WRKSRC}/README.port ${STAGEDIR}${PREFIX}/share/doc/pipsecd .endif post-install: - ${STRIP_CMD} ${PREFIX}/sbin/pipsecd + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/pipsecd .include Modified: head/net/pipsecd/pkg-plist ============================================================================== --- head/net/pipsecd/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/net/pipsecd/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -1,6 +1,8 @@ sbin/pipsecd etc/ipsec/pipsecd.conf.sample +@mode 755 etc/rc.d/pipsecd.sh +@mode 644 %%PORTDOCS%%share/doc/pipsecd/README %%PORTDOCS%%share/doc/pipsecd/COPYRIGHT %%PORTDOCS%%share/doc/pipsecd/README.port Modified: head/net/tcpview/Makefile ============================================================================== --- head/net/tcpview/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/net/tcpview/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -11,17 +11,17 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= cy@FreeBSD.org COMMENT= Motif-based TCP/IP protocol analyzer -USES= bison motif +MAKE_JOBS_UNSAFE= yes -MAN1= tcpview.1 +USES= bison motif +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} -NO_STAGE= yes post-patch: .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c @${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f} .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${LOCALBASE}/lib/X11/app-defaults + ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${STAGEDIR}${PREFIX}/lib/X11/app-defaults .include Modified: head/net/tcpview/files/patch-Makefile ============================================================================== --- head/net/tcpview/files/patch-Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/net/tcpview/files/patch-Makefile Fri May 30 05:56:15 2014 (r355791) @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Apr 22 23:40:24 1993 -+++ Makefile Mon Feb 17 13:32:10 2003 +--- Makefile.orig 1993-04-22 14:40:24.000000000 -0700 ++++ Makefile 2014-05-29 22:43:08.670436162 -0700 @@ -21,17 +21,16 @@ # @(#) $Header: /usr/staff/martinh/tcpview/RCS/Makefile,v 1.3 1992/11/17 21:59:47 martinh Exp martinh $ (UW) @@ -157,13 +157,13 @@ - install -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \ - install -c tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \ - install -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST) -+ ${BSD_INSTALL_PROGRAM} -c $$dir/tcpview $(DESTDIR)$(BINDEST); \ ++ ${BSD_INSTALL_PROGRAM} -c $$dir/tcpview $(BINDEST); \ + ${BSD_INSTALL_PROGRAM} -c $$dir/BGP $(FILTER_DIR); \ + ${BSD_INSTALL_PROGRAM} -c $$dir/telnet $(FILTER_DIR); \ + ${BSD_INSTALL_PROGRAM} -c $$dir/generic $(FILTER_DIR); \ + ${BSD_INSTALL_DATA} -c $$dir/../DOC/hosts $(TCPVIEW_DIR); \ + ${BSD_INSTALL_DATA} -c $$dir/../DOC/manuf $(TCPVIEW_DIR); \ -+ ${BSD_INSTALL_MAN} -c $$dir/../DOC/tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \ ++ ${BSD_INSTALL_MAN} -c $$dir/../DOC/tcpview.1 $(TCPVIEW_MANDEST); \ +# install -m 444 -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \ +# install -m 444 -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST) Modified: head/net/tcpview/pkg-plist ============================================================================== --- head/net/tcpview/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/net/tcpview/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -4,6 +4,7 @@ lib/tcpview/filters/telnet lib/tcpview/filters/generic lib/tcpview/hosts lib/tcpview/manuf +man/man1/tcpview.1.gz @dirrm lib/tcpview/filters @dirrm lib/tcpview lib/X11/app-defaults/Tcpview Modified: head/sysutils/44bsd-more/Makefile ============================================================================== --- head/sysutils/44bsd-more/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/sysutils/44bsd-more/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -10,15 +10,13 @@ MASTER_SITE_SUBDIR= cy MAINTAINER= cy@FreeBSD.org COMMENT= The pager installed with FreeBSD before less(1) was imported -USE_BZIP2= yes +USES= tar:bzip2 NO_WRKSUBDIR= yes -MAN1= 44bsd-more.1 CFLAGS= -Wno-return-type RELDATE= 20000521 -NO_STAGE= yes .include post-extract: @@ -33,13 +31,13 @@ post-patch: ${WRKSRC}/ncommand.c do-install: - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/more.1 ${PREFIX}/man/man1/44bsd-more.1 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/more.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-more.1 .for f in default.morerc less.morerc most.morerc - ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/more.help ${PREFIX}/share/misc/44bsd-more.help - ${INSTALL_PROGRAM} ${WRKSRC}/more ${PREFIX}/bin/44bsd-more + ${INSTALL_DATA} ${WRKSRC}/more.help ${STAGEDIR}${PREFIX}/share/misc/44bsd-more.help + ${INSTALL_PROGRAM} ${WRKSRC}/more ${STAGEDIR}${PREFIX}/bin/44bsd-more tarup: cd ${WRKSRC} && tar cyf /tmp/${DISTFILES} RCS Modified: head/sysutils/44bsd-more/pkg-plist ============================================================================== --- head/sysutils/44bsd-more/pkg-plist Fri May 30 05:55:54 2014 (r355790) +++ head/sysutils/44bsd-more/pkg-plist Fri May 30 05:56:15 2014 (r355791) @@ -1,4 +1,5 @@ bin/44bsd-more +man/man1/44bsd-more.1.gz share/misc/44bsd-more.help share/examples/44bsd-more/default.morerc share/examples/44bsd-more/less.morerc Modified: head/sysutils/cfengine/Makefile ============================================================================== --- head/sysutils/cfengine/Makefile Fri May 30 05:55:54 2014 (r355790) +++ head/sysutils/cfengine/Makefile Fri May 30 05:56:15 2014 (r355791) @@ -5,5 +5,4 @@ CFENGINE_VERSION?= 35 MASTERDIR= ${.CURDIR}/../cfengine${CFENGINE_VERSION} -NO_STAGE= yes .include "${MASTERDIR}/Makefile"