diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-07-27 02:06:26 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-07-27 02:06:26 +0000 |
commit | 8a48556be8edc2dfaf7ccc4f8a473420460222a6 (patch) | |
tree | 153d874c16b8bc63f7f707aa145658af6da8c6d4 /Mk/bsd.port.mk | |
parent | until it's fixed by the author, add a patch to fix transfering a whole (diff) |
* Add USE_SDL option, which adds a dependency on the sdl12 port and
sets up SDL_CONFIG in the build environment. [1]
* Add the -o option to unzip when extracting files with USE_ZIP, to
overwrite files when extracting, for consistency with other
extraction targets. [2]
* Fix port installation/deinstallation on FreeBSD 4.6.2 and older
(which does not have pkg_info -O), by falling back to the old
installation/deinstallation logic on these systems [3]
* Correctly handle pkg-plist files that contain @cwd directives with
the new install/deinstall code [4]
* Set up POSIX and en_US.US-ASCII locale symlinks after running mtree
on BSD.local.dist. [5]
Submitted by: David Yeske <dyeske@yahoo.com> [1],
Alexey Dokuchaev <danfe@regency.nsu.ru> [2],
Sergey Matveychuk <sem@ciam.ru> [3],
Chris BeHanna <behanna@zbzoom.net> [3], marcus [4],
ache [5]
PR: ports/52309 [1], ports/52856 [2], ports/53189 [5]
Notes
Notes:
svn path=/head/; revision=85650
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r-- | Mk/bsd.port.mk | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7c25406e475d..06dd008ace08 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -340,6 +340,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_FREETYPE - Says that the port uses the freetype print libraries. # USE_MESA - Says that the port uses the Mesa libraries. # USE_MOTIF - Says that the port uses the Motif toolkit. Implies USE_XPM. +# USE_SDL - Says that the port uses the sdl libraries. # USE_XPM - Says that the port uses the xpm graphics libraries. ## # USE_OPENSSL - Says that the port relies on the OpenSSL package. @@ -1357,6 +1358,13 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base .endif +.if defined(USE_SDL) +LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} +MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG} +.endif + .if defined(USE_MOTIF) USE_XPM= yes .if !defined(NO_OPENMOTIF) @@ -1597,7 +1605,7 @@ TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section .if defined(USE_ZIP) EXTRACT_CMD?= unzip -EXTRACT_BEFORE_ARGS?= -q +EXTRACT_BEFORE_ARGS?= -qo EXTRACT_AFTER_ARGS?= -d ${WRKDIR} .else EXTRACT_BEFORE_ARGS?= -dc @@ -3008,11 +3016,12 @@ delete-package-list: delete-package-links-list .if !target(check-already-installed) check-already-installed: .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) +.if ${OSVERSION} >= 460102 @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed" @already_installed=`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`; \ if [ -n "$${already_installed}" ]; then \ for p in $${already_installed}; do \ - prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -e 's|^@cwd ||'`; \ + prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${HEAD} -n 1 | ${SED} -ne '1s|^@cwd ||p'`; \ if [ "x${PREFIX}" = "x$${prfx}" ]; then \ df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \ if [ -n "$${df}" ]; then \ @@ -3021,8 +3030,9 @@ check-already-installed: fi; \ fi; \ done; \ - fi; \ - if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ + fi; +.endif + @if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \ else \ @@ -3068,6 +3078,11 @@ install-mtree: exit 1; \ else \ ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \ + if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \ + cd ${PREFIX}/share/nls; \ + ${LN} -sf C POSIX; \ + ${LN} -sf C en_US.US-ASCII; \ + fi; \ fi; \ else \ ${ECHO_MSG} "Warning: not superuser, can't run mtree."; \ @@ -3399,11 +3414,12 @@ reinstall: .if !target(deinstall) deinstall: @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" +.if ${OSVERSION} >= 460102 @found_names=`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`; \ for p in $${found_names}; do \ check_name=`${ECHO} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ if [ "$${check_name}" = "${PKGBASE}" ]; then \ - prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -e 's|^@cwd ||'`; \ + prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${HEAD} -n 1 | ${SED} -ne '1s|^@cwd ||p'`; \ if [ "x${PREFIX}" = "x$${prfx}" ]; then \ ${ECHO_MSG} "===> Deinstalling $${p}"; \ ${PKG_DELETE} -f $${p}; \ @@ -3415,6 +3431,13 @@ deinstall: if [ -z "$${found_names}" ]; then \ ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \ fi +.else + @if ${PKG_INFO} -e ${PKGNAME}; then \ + ${PKG_DELETE} -f ${PKGNAME}; \ + else \ + ${ECHO_MSG} "===> ${PKGNAME} not installed, skipping"; \ + fi +.endif @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} .endif @@ -3424,6 +3447,7 @@ deinstall: .if !target(deinstall-all) deinstall-all: +.if ${OSVERSION} >= 460102 @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" @deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN} 2> /dev/null`; \ if [ -n "$${deinstall_names}" ]; then \ @@ -3436,6 +3460,7 @@ deinstall-all: fi @${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} .endif +.endif # Cleaning up |