Date: Fri, 6 Dec 2013 08:20:16 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335725 - head/Mk Message-ID: <201312060820.rB68KGKH005468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Fri Dec 6 08:20:16 2013 New Revision: 335725 URL: http://svnweb.freebsd.org/changeset/ports/335725 Log: - Implement support for architecture-neutral ports - Replace 'alpha' with 'amd64' - Remove gratuitous whitespaces at the end of the line Approved by: portmgr (bapt) Modified: head/Mk/bsd.pkgng.mk (contents, props changed) head/Mk/bsd.port.mk Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Fri Dec 6 08:11:51 2013 (r335724) +++ head/Mk/bsd.pkgng.mk Fri Dec 6 08:20:16 2013 (r335725) @@ -39,12 +39,15 @@ ACTUAL-PACKAGE-DEPENDS?= \ create-manifest: @${MKDIR} ${METADIR} @${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} - @${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} - @${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} + @${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} + @${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} @${ECHO_CMD} "comment: |" >> ${MANIFESTF} @${ECHO_CMD} " "${COMMENT:Q} >> ${MANIFESTF} @${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF} @${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF} +.if defined(NOARCH) + @${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF} +.endif .if defined(WWW) @${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF} .endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Dec 6 08:11:51 2013 (r335724) +++ head/Mk/bsd.port.mk Fri Dec 6 08:20:16 2013 (r335725) @@ -69,7 +69,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc. # Optional. # PKGNAMESUFFIX - Suffix to specify compilation options or a version -# designator (in case there are different versions of +# designator (in case there are different versions of # one port as is the case for Tcl). # Optional. # PKGVERSION - Always defined as ${PORTVERSION}. @@ -215,8 +215,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # generated on the fly. # Default: not set. # +# NOARCH - Set this if port is architecture neutral. +# # Set these if your port only makes sense to certain architectures. -# They are lists containing names for them (e.g., "alpha i386"). +# They are lists containing names for them (e.g., "amd64 i386"). # (Defaults: not set.) # # ONLY_FOR_ARCHS @@ -815,7 +817,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: none # FETCH_REGET - Times to retry fetching of files on checksum errors. # Default: 1 -# CLEAN_FETCH_ENV +# CLEAN_FETCH_ENV # - Disable package dependency in fetch target for mass # fetching. User settable. # @@ -1139,7 +1141,7 @@ LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/l .undef NO_STAGE .endif -# make sure bmake treats -V as expected +# make sure bmake treats -V as expected .MAKE.EXPAND_VARIABLES= yes # tell bmake we use the old :L :U modifiers .MAKE.FreeBSD_UL= yes @@ -1575,7 +1577,7 @@ CONFIGURE_WRKSRC?= ${WRKSRC} BUILD_WRKSRC?= ${WRKSRC} INSTALL_WRKSRC?=${WRKSRC} -PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} +PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ WWWDIR=${WWWDIR} ETCDIR=${ETCDIR} @@ -2323,7 +2325,7 @@ INSTALL_PROGRAM= \ INSTALL_KLD= \ ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} INSTALL_LIB= \ - ${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE} + ${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE} INSTALL_SCRIPT= \ ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} INSTALL_DATA= \ @@ -3008,7 +3010,7 @@ _MANPAGES+= ${MAN${sect}_${manlang:S%^ma .endfor # Special case for English, since it is defined with "" in MANLANG rather than -# a language name and does not have man pages installed in a lang subdirectory +# a language name and does not have man pages installed in a lang subdirectory # of MAN${sect}PREFIX. .for sect in 1 2 3 4 5 6 7 8 9 L N .if defined(MAN${sect}_EN) @@ -4296,7 +4298,7 @@ create-users-groups: .endif # PR ports/152498 -# XXX Make sure the commands to create group(s) +# XXX Make sure the commands to create group(s) # and user(s) are the first in pkg-plist .if !target(fix-plist-sequence) fix-plist-sequence: ${TMPPLIST} @@ -5868,7 +5870,7 @@ generate-plist: @if [ -f ${PLIST} ]; then \ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ fi - + .for dir in ${PLIST_DIRS} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312060820.rB68KGKH005468>