diff options
author | grant <grant@pkgsrc.org> | 2003-03-30 05:06:49 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2003-03-30 05:06:49 +0000 |
commit | 6dec3e31abca7b3c4024b1a9e2c7b2a875b397b8 (patch) | |
tree | de3fdf3697494500c1937da254d4e03e0ea97170 /mk | |
parent | e62066ed7cc32520f978ce6237c71568de61414e (diff) | |
download | pkgsrc-6dec3e31abca7b3c4024b1a9e2c7b2a875b397b8.tar.gz |
kill some trailing whitespace
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 5deff735019..90554164058 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1158 2003/03/28 21:15:58 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1159 2003/03/30 05:06:49 grant Exp $ # # This file is in the public domain. # @@ -274,7 +274,7 @@ LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib .if defined(USE_X11) X11_LDFLAGS= # empty -X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib +X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib X11_LDFLAGS+= -L${X11BASE}/lib LDFLAGS+= ${X11_LDFLAGS} .endif @@ -647,7 +647,7 @@ INSTALL_TARGET+= install.man FETCH_BEFORE_ARGS += -p .endif -# Check if we got "rman" with XFree86, for packages that need "rman". +# Check if we got "rman" with XFree86, for packages that need "rman". .if defined(USE_RMAN) . if !exists(${X11BASE}/bin/rman) DEPENDS+= rman-3.0.9:../../textproc/rman @@ -806,7 +806,7 @@ MASTER_SITE_SUNSITE+= \ ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/ \ ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/ \ ftp://ftp.tuwien.ac.at/pub/linux/ibiblio/ \ - ftp://ftp.unicamp.br/pub/systems/Linux/ + ftp://ftp.unicamp.br/pub/systems/Linux/ MASTER_SITE_GNOME+= \ ftp://ftp.gnome.org/pub/GNOME/ \ @@ -819,7 +819,7 @@ MASTER_SITE_GNOME+= \ ftp://ftp.chg.ru/pub/X11/gnome/ \ ftp://ftp.dataplus.se/pub/linux/gnome/ \ ftp://ftp.dit.upm.es/linux/gnome/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/GNOME/ + ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/GNOME/ MASTER_SITE_SOURCEFORGE+= \ http://belnet.dl.sourceforge.net/sourceforge/ \ @@ -840,7 +840,7 @@ MASTER_SITE_SUSE+= \ ftp://ftp.kddlabs.co.jp/Linux/packages/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \ ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \ ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \ - ftp://mirror.mcs.anl.gov/pub/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ + ftp://mirror.mcs.anl.gov/pub/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ MASTER_SITE_MOZILLA+= \ ftp://ftp.mozilla.org/pub/mozilla/releases/ \ @@ -854,7 +854,7 @@ MASTER_SITE_MOZILLA+= \ ftp://ftp2.sinica.edu.tw/pub3/www/mozilla/ \ ftp://ftp.is.co.za/networking/info-service/www/clients/netscape/mozilla/ \ ftp://ftp.rediris.es/mirror/mozilla/ \ - ftp://ftp.chg.ru/pub/WWW/mozilla/ + ftp://ftp.chg.ru/pub/WWW/mozilla/ MASTER_SITE_XEMACS+= \ ftp://ftp.xemacs.org/pub/xemacs/ \ @@ -990,7 +990,7 @@ PKG_FAIL_REASON+='ONLY/NOT_FOR_ARCHS/OPSYS are deprecated and must be replaced w .endif .if (${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once") -. if !defined(OBJHOSTNAME) +. if !defined(OBJHOSTNAME) PKG_FAIL_REASON+='PKGSRC_LOCKTYPE needs OBJHOSTNAME defined.' . elif !exists(${SHLOCK}) PKG_FAIL_REASON+='The ${SHLOCK} utility does not exist, and is necessary for locking.' @@ -1337,7 +1337,7 @@ MASTER_SORT_REGEX+= ${MASTER_SORT:S/./\\./g:C/.*/:\/\/[^\/]*&\//} MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX}"; } . for srt in ${MASTER_SORT_REGEX} -MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt}"] = good["${srt}"] " " $$0 ; next; } +MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt}"] = good["${srt}"] " " $$0 ; next; } . endfor MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } @@ -1402,7 +1402,7 @@ do-fetch: ${MAKE} ${MAKEFLAGS} batch-check-distfiles . else . for fetchfile in ${_ALLFILES} -. if defined(_FETCH_MESSAGE) +. if defined(_FETCH_MESSAGE) ${_PKG_SILENT}${_PKG_DEBUG} \ file="${fetchfile}"; \ if [ ! -f ${DISTDIR}/$$file ]; then \ @@ -1639,7 +1639,7 @@ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip .endif .if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \ !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) -BUILD_DEPENDS+= lha>=114.9:../../archivers/lha +BUILD_DEPENDS+= lha>=114.9:../../archivers/lha .endif .if !defined(GZCAT) . if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ @@ -1944,7 +1944,7 @@ do-pkgconfig-override: # * config.h.in is generated by autoheader from configure.in # * Makefile.in is generated from Makefile.am, # * the configure script is generated by autoconf from configure.in, -# aclocal.m4, and various other *.m4 files. +# aclocal.m4, and various other *.m4 files. # # After configure script is run: # * config.status is generated by the configure script, @@ -1959,7 +1959,7 @@ do-pkgconfig-override: # AUTOMAKE_OVERRIDE?= YES . if empty(AUTOMAKE_OVERRIDE:M[nN][oO]) -AUTOMAKE_PATTERNS+= aclocal.m4 +AUTOMAKE_PATTERNS+= aclocal.m4 AUTOMAKE_PATTERNS+= configure.in AUTOMAKE_PATTERNS+= Makefile.in AUTOMAKE_PATTERNS+= stamp-h.in stamp-h\[0-9\].in @@ -2565,7 +2565,7 @@ release-build-lock: ################################################################ # Skeleton targets start here -# +# # You shouldn't have to change these. Either add the pre-* or # post-* targets/scripts or redefine the do-* targets. These # targets don't do anything other than checking for cookies and @@ -2735,7 +2735,7 @@ _SU_TARGET= \ ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \ fi -do-su-install: +do-su-install: ${_PKG_SILENT}${_PKG_DEBUG} \ extractname=`${CAT} ${EXTRACT_COOKIE}`; \ case "$$extractname" in \ @@ -2750,28 +2750,28 @@ do-su-install: ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-install"; \ action="install"; \ - ${_SU_TARGET} + ${_SU_TARGET} do-su-package: @${ECHO_MSG} "${_PKGSRC_IN}> Packaging ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-package"; \ action="package"; \ - ${_SU_TARGET} + ${_SU_TARGET} do-su-replace: @${ECHO_MSG} "${_PKGSRC_IN}> Replacing ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-replace"; \ action="replace"; \ - ${_SU_TARGET} + ${_SU_TARGET} do-su-undo-replace: @${ECHO_MSG} "${_PKGSRC_IN}> Undoing Replacement of ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-undo-replace"; \ action="undo-replace"; \ - ${_SU_TARGET} + ${_SU_TARGET} # Empty pre-* and post-* targets @@ -2812,7 +2812,7 @@ do-su-deinstall: uptodate-pkgtools realtarget="real-su-deinstall"; \ realflags="DEINSTALLDEPENDS=${DEINSTALLDEPENDS}"; \ action="deinstall"; \ - ${_SU_TARGET} + ${_SU_TARGET} . if (${DEINSTALLDEPENDS} != "NO") . if (${DEINSTALLDEPENDS} != "ALL") @@ -3089,9 +3089,9 @@ clean-depends: .endif -# The clean-depends-list target will produce a list of all -# BUILD_DEPENDS and DEPENDS packages. -# As each *DEPENDS package is visited, it is added to the +# The clean-depends-list target will produce a list of all +# BUILD_DEPENDS and DEPENDS packages. +# As each *DEPENDS package is visited, it is added to the # CLEAN_DEPENDS_LIST_SEEN variable. Once a pkg is in the list # it will not be visited again. This prevents traversing the same # part of the dependency tree multiple times. Each depending package @@ -3149,7 +3149,7 @@ distclean: pre-distclean clean ${TEST} -z "${PATCHFILES}" || ${RM} -f ${PATCHFILES}; \ fi . if defined(DIST_SUBDIR) && exists(DIST_SUBDIR) - -${_PKG_SILENT}${_PKG_DEBUG}${RMDIR} ${_DISTDIR} + -${_PKG_SILENT}${_PKG_DEBUG}${RMDIR} ${_DISTDIR} . endif -${_PKG_SILENT}${_PKG_DEBUG}${RM} -f README.html .endif @@ -3779,7 +3779,7 @@ README.html: .PRECIOUS PKGSRCDIR=${.CURDIR:C|/[^/]*/[^/]*$||} \ TMPDIR=${TMPDIR:U/tmp} \ SINGLEPKG=${PKGPATH} \ - $@.tmp1 + $@.tmp1 @${RM} $@.tmp1 .if !target(show-pkgtools-version) @@ -3820,9 +3820,9 @@ print-run-depends-list: # README.html files .if !target(print-summary-data) print-summary-data: - @${ECHO} "depends ${PKGPATH} ${DEPENDS}" - @${ECHO} "build_depends ${PKGPATH} ${BUILD_DEPENDS}" - @${ECHO} "conflicts ${PKGPATH} ${CONFLICTS}" + @${ECHO} "depends ${PKGPATH} ${DEPENDS}" + @${ECHO} "build_depends ${PKGPATH} ${BUILD_DEPENDS}" + @${ECHO} "conflicts ${PKGPATH} ${CONFLICTS}" @${ECHO} "index ${PKGPATH} ${PKGNAME}" @${ECHO} htmlname ${PKGPATH} ${HTML_PKGNAME:Q} @${ECHO} homepage ${PKGPATH} ${HOMEPAGE:Q} @@ -3843,8 +3843,8 @@ show-license show-licence: fi .endif -# Stat all the files of one pkg and sum the sizes up. -# +# Stat all the files of one pkg and sum the sizes up. +# # XXX This is intended to be run before pkg_create is called, so the # existence of ${PLIST} can be assumed. print-pkg-size-this: @@ -3863,9 +3863,9 @@ print-pkg-size-this: | ${DC} # Sizes of required pkgs (only) -# +# # XXX This is intended to be run before pkg_create is called, so the -# dependencies are all installed. +# dependencies are all installed. print-pkg-size-depends: @${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true \ | ${XARGS} -n 1 ${SETENV} ${PKG_INFO} -e \ @@ -4183,7 +4183,7 @@ _MANZ_EXPRESSION= -e 's|\(^\([^@/]*/\)*man/\([^/]*/\)\{0,1\}man[1-9ln]/.*[1-9ln] . endif # MANZ _MANZ_NAWK_CMD= .else -_MANZ_EXPRESSION= +_MANZ_EXPRESSION= . ifdef MANZ _MANZ_NAWK_CMD= ${AWK} '/^([^\/]*\/)*man\/([^\/]*\/)?man[1-9ln]\/.*[1-9ln]\.gz$$/ { \ $$0 = sprintf("%s.gz", $$0); \ |