From owner-svn-doc-all@freebsd.org Mon Jun 29 15:32:12 2015 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEE4D98F1ED; Mon, 29 Jun 2015 15:32:12 +0000 (UTC) (envelope-from mat@FreeBSD.org) 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 C2B501BDF; Mon, 29 Jun 2015 15:32:12 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5TFWC5c094451; Mon, 29 Jun 2015 15:32:12 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5TFWCmF094448; Mon, 29 Jun 2015 15:32:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201506291532.t5TFWCmF094448@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 29 Jun 2015 15:32:12 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46894 - in head/en_US.ISO8859-1/books/porters-handbook: makefiles slow-porting special X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2015 15:32:13 -0000 Author: mat Date: Mon Jun 29 15:32:11 2015 New Revision: 46894 URL: https://svnweb.freebsd.org/changeset/doc/46894 Log: Fixup a lot of Approved by: wblock (mentor) Differential Revision: https://reviews.freebsd.org/D2939 Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -3146,7 +3146,7 @@ ALWAYS_KEEP_DISTFILES= yes For example, RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \ -xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr will check if the file or directory /usr/local/news/bin/innd exists, and @@ -3502,9 +3502,9 @@ RUN_DEPENDS= ${MY_DEPENDS}.include <bsd.port.pre.mk> - .if exists(${LOCALBASE}/bin/foo) - LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar - .endif +.if exists(${LOCALBASE}/bin/foo) +LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar +.endif The problem with trying to automatically add dependencies @@ -3601,10 +3601,11 @@ PKGNAMESUFFIX= ${RESOLUTION} # default RESOLUTION?= 300 .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \ -${RESOLUTION} != 300 && ${RESOLUTION} != 400 -@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" -@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." -@${FALSE} + ${RESOLUTION} != 300 && ${RESOLUTION} != 400 +pre-everything:: + @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" + @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." + @${FALSE} .endif japanese/xdvi300 also has all @@ -3972,9 +3973,11 @@ FOO_CONFIGURE_ENABLE= fooMalformed conditional, an alternative syntax can be used. - .if !empty(VARIABLE:MVALUE) -# as an alternative to -.if ${VARIABLE:MVALUE} + .if !empty(VARIABLE:MVALUE) + + as an alternative to + + .if ${VARIABLE:MVALUE} @@ -4775,14 +4778,14 @@ PORTVERSION= 1.0 example: post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl When multiple files need to be stripped: post-install: - .for l in geometry media body track world - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0 - .endfor +.for l in geometry media body track world + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0 +.endfor Use &man.file.1; on a file to determine if it has been stripped. Binaries are reported by &man.file.1; as Modified: head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -408,7 +408,7 @@ variable: post-patch: - @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README + @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README Quite often, software being ported uses the CR/LF convention in source files. This may cause problems with Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Mon Jun 29 15:17:22 2015 (r46893) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Mon Jun 29 15:32:11 2015 (r46894) @@ -1772,11 +1772,11 @@ PLIST_SUB+= QT_INCDIR=${QT_INCDIR_REL} \ This snippet demonstrates the use of qmake for a Qt 4 port: - USES= qmake:outsource + USES= qmake:outsource USE_QT4= moc_build For a Qt 5 port: - USES= qmake:outsource + USES= qmake:outsource USE_QT5= buildtools_build @@ -1795,8 +1795,8 @@ USE_QT5= buildtools_build - QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \ - LIBS+=-L${LOCALBASE}/lib + QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \ + LIBS+=-L${LOCALBASE}/lib