From owner-svn-ports-all@FreeBSD.ORG Thu Mar 6 18:31:08 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 EF76711F; Thu, 6 Mar 2014 18:31:07 +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 DC3479D0; Thu, 6 Mar 2014 18:31:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26IV7Gs037492; Thu, 6 Mar 2014 18:31:07 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26IV7hJ037487; Thu, 6 Mar 2014 18:31:07 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403061831.s26IV7hJ037487@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 6 Mar 2014 18:31:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347297 - in head/ftp/wput: . files 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.17 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: Thu, 06 Mar 2014 18:31:08 -0000 Author: bapt Date: Thu Mar 6 18:31:06 2014 New Revision: 347297 URL: http://svnweb.freebsd.org/changeset/ports/347297 QAT: https://qat.redports.org/buildarchive/r347297/ Log: Support stage Modified: head/ftp/wput/Makefile head/ftp/wput/files/patch-Makefile.in head/ftp/wput/pkg-plist Modified: head/ftp/wput/Makefile ============================================================================== --- head/ftp/wput/Makefile Thu Mar 6 18:24:50 2014 (r347296) +++ head/ftp/wput/Makefile Thu Mar 6 18:31:06 2014 (r347297) @@ -22,29 +22,15 @@ MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= TLS NLS DOCS EXAMPLES OPTIONS_DEFAULT= TLS +OPTIONS_SUB= yes -MAN1= wdel.1 wput.1 - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MTLS} -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-ssl -.else -CONFIGURE_ARGS+= --without-ssl -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext iconv -CONFIGURE_ARGS+= --enable-nls \ +TLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +TLS_CONFIGURE_WITH= ssl +NLS_USES+= gettext iconv +NLS_CONFIGURE_ON= --enable-nls \ --with-libintl-prefix=${LOCALBASE} \ ${ICONV_CONFIGURE_ARG} -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls --without-libiconv-prefix -PLIST_SUB= NLS="@comment " -.endif +NLS_CONFIGURE_OFF= --disable-nls --without-libiconv-prefix pre-configure: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ @@ -52,16 +38,10 @@ pre-configure: ${WRKSRC}/src/socketlib.c post-install: - @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/doc/,} ${MANPREFIX}/man/man1/ - -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} - @${INSTALL} -d ${EXAMPLESDIR} - @${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR} -.endif + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/ftp/wput/files/patch-Makefile.in ============================================================================== --- head/ftp/wput/files/patch-Makefile.in Thu Mar 6 18:24:50 2014 (r347296) +++ head/ftp/wput/files/patch-Makefile.in Thu Mar 6 18:31:06 2014 (r347297) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-09-27 12:31:23.000000000 +0200 -+++ Makefile.in 2008-12-17 17:12:36.000000000 +0100 -@@ -2,14 +2,13 @@ +--- ./Makefile.in.orig 2008-09-27 12:31:23.000000000 +0200 ++++ ./Makefile.in 2014-03-06 19:28:57.697592894 +0100 +@@ -2,26 +2,23 @@ PACKAGE = @PACKAGE@ prefix = @prefix@ datadir = $(prefix)/share @@ -16,13 +16,19 @@ win-clean: cd src && $(MAKE) $(MAKEDEFS) $@ -@@ -19,9 +18,7 @@ - mkdir -p $(bindir) - mkdir -p $(mandir) - install -m0755 wput $(bindir) + + install: all + cd po && $(MAKE) $(MAKEDEFS) $@ +- mkdir -p $(bindir) +- mkdir -p $(mandir) +- install -m0755 wput $(bindir) - install -m0644 doc/wput.1.gz $(mandir) - ln -s $(bindir)/wput $(bindir)/wdel +- ln -s $(bindir)/wput $(bindir)/wdel - install -m0644 doc/wdel.1.gz $(mandir) ++ mkdir -p $(DESTDIR)$(bindir) ++ mkdir -p $(DESTDIR)$(mandir) ++ install -m0755 wput $(DESTDIR)$(bindir) ++ ln -sf wput $(DESTDIR)$(bindir)/wdel @echo "----------------" @echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for" @echo "usage information." Modified: head/ftp/wput/pkg-plist ============================================================================== --- head/ftp/wput/pkg-plist Thu Mar 6 18:24:50 2014 (r347296) +++ head/ftp/wput/pkg-plist Thu Mar 6 18:31:06 2014 (r347297) @@ -1,5 +1,7 @@ bin/wdel bin/wput +man/man1/wdel.1.gz +man/man1/wput.1.gz %%NLS%%share/locale/da/LC_MESSAGES/wput.mo %%NLS%%share/locale/de/LC_MESSAGES/wput.mo %%NLS%%share/locale/el/LC_MESSAGES/wput.mo