mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Remove obsolete USE_XLIB and MACHINE_ARCH definitions [1], [4]

Browse Source 
- Include top-level Makefile.inc from correct directory [2]

 - Add new target add-plist-buildinfo for package build details [3]

PR:		ports/152871 [1]
PR:		ports/164207 [2]
PR:		ports/162397 [3]
PR:		ports/167677 [4]

Submitted by:	eadler [1], [4]; glarkin [2]; jhelfman@experts-exchange.com [3]
This commit is contained in:
Mark Linimon 2012-09-06 20:59:27 +00:00
parent 0486662332
commit bfb3226436
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303789
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Mk/bsd.port.mk
View File

@ -38,9 +38,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# different actions for different values.
#
# ARCH - The architecture of the target machine, such as would be
# returned by "uname -p". (Note: Ports should test against
# ARCH, and not the host machine's architecture which is
# MACHINE_ARCH, to enable ports to be cross-built.)
# returned by "uname -p".
# OPSYS - Portability clause. This is the operating system the
# makefile is being used on. Automatically set to
# "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
@ -359,8 +357,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_IMAKE - If set, this port uses imake.
# XMKMF - Set to path of `xmkmf' if not in $PATH
# Default: xmkmf -a
# USE_XLIB - If set, this port uses the X libraries. In the USE_LINUX
# case the linux X libraries are referenced.
# USE_DISPLAY - If set, this ports requires a (virtual) X11 environment
# setup. If the environment variable DISPLAY Is not set,
# then an extra build dependency on Xvfb is added. Further,
@ -1192,9 +1188,6 @@ MAINTAINER?= ports@FreeBSD.org
ARCH!= ${UNAME} -p
.endif
# Kludge for pre-3.0 systems
MACHINE_ARCH?= i386
# Get the operating system type
.if !defined(OPSYS)
OPSYS!= ${UNAME} -s
@ -2105,21 +2098,12 @@ IGNORE= uses unknown USE_BISON construct
.include "${PORTSDIR}/Mk/bsd.cmake.mk"
.endif
.if exists(${PORTSDIR}/../Makefile.inc)
.include "${PORTSDIR}/../Makefile.inc"
.if exists(${PORTSDIR}/Makefile.inc)
.include "${PORTSDIR}/Makefile.inc"
USE_SUBMAKE= yes
.endif
.if defined(USE_XLIB)
. if defined(USE_LINUX)
RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
. else
BUILD_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
. endif
.endif
.if defined(USE_XLIB) || defined(USE_XORG)
.if defined(USE_XORG)
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
@ -4333,10 +4317,10 @@ _INSTALL_SEQ= install-message check-install-conflicts run-depends lib-depends ap
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
pre-su-install-script create-users-groups do-install \
install-desktop-entries install-license install-rc-script \
post-install post-install-script add-plist-info \
add-plist-docs add-plist-examples add-plist-data \
add-plist-post fix-plist-sequence compress-man \
install-ldconfig-file fake-pkg security-check
post-install post-install-script add-plist-buildinfo \
add-plist-info add-plist-docs add-plist-examples \
add-plist-data add-plist-post fix-plist-sequence \
compress-man install-ldconfig-file fake-pkg security-check
_PACKAGE_DEP= install
_PACKAGE_SEQ= package-message pre-package pre-package-script \
do-package post-package-script
@ -5814,6 +5798,13 @@ add-plist-data:
.endif
.endif
.if defined(PACKAGE_BUILDING)
.if !target(add-plist-buildinfo)
add-plist-buildinfo:
@${ECHO_CMD} "@comment Build details: ${BUILDHOST}|${JAIL}|${BUILD}|${PORTSTREE}|${BUILDDATE}" >> ${TMPPLIST}
.endif
.endif
.if !target(add-plist-info)
add-plist-info:
# Process GNU INFO files at package install/deinstall time