Check-in [ee2ba26bcd]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Sync with latest version
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ee2ba26bcda33eb1cf64596d00ad665be0ca98ac
User & Date: bapt 2012-06-16 15:22:43
Context
2012-06-18
05:43
use compact test syntax wrap long lines return by default returns 0 ECHO_CMD defined as sh builtin and always return 0, therefore change && to ;

Submitted by: Alex Kozlov (ak@) check-in: 408c12ee83 user: bapt tags: trunk

2012-06-16
15:22
Sync with latest version check-in: ee2ba26bcd user: bapt tags: trunk
2012-06-10
00:19
Use MANPREFIX and install to proper man/ not share/man/ check-in: cf10bae319 user: bdrewery tags: trunk
Changes

Changes to ports/Mk/bsd.options.desc.mk.

     1         -# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.58 2012/06/09 15:44:56 miwi Exp $
            1  +# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.73 2012/06/15 16:58:34 dinoex Exp $
     2      2   #
     3      3   # READ BEFORE EDITING:
     4      4   # - Please keep descriptions sorted alphabetically by variable name.
     5      5   #
     6      6   
     7      7   Options_Desc_MAINTAINER=	ports@FreeBSD.org
     8      8   
................................................................................
    11     11   ALSA_DESC?=		Enable alsa audio support
    12     12   AMR_DESC?=		Enable OpenCORE AMR 3GPP Speech Codecs
    13     13   AO_DESC?=		Support libao audio library
    14     14   APACHE_DESC?=		Enable Apache server
    15     15   APE_DESC?=		Enable Monkey's Audio support
    16     16   ARCHIVE_DESC?=		Support bzip2/zip/iso9660 archive
    17     17   ARTS_DESC?=		Enable Arts audio system support
           18  +ASPELL_DESC?=		Enable spell checking via Aspell
    18     19   ASSERT_DESC?=		Enable debug assertions
    19     20   AVAHI_DESC?=		Support Zeroconf through Avahi
    20         -BDB1_DESC?=		Enable Berkeley DB 1.85 support
    21     21   BDB_DESC?=		Enable Berkeley DB support
           22  +BDB1_DESC?=		Enable Berkeley DB 1.85 support
           23  +BOOST_DESC?=		Enable Boost support
    22     24   CACA_DESC?=		Enable libcaca support
    23     25   CAIRO_DESC?=		Enable Cairo graphic library support
    24     26   CDDA2WAV_DESC?=		Enable cdda2wav CD ripper
    25     27   CDDB_DESC?=		Enable CDDB support
    26     28   CDPARANOIA_DESC?=	Enable cdparanoia CD ripper
    27     29   CFITSIO_DESC?=		Enable FITS support via CFITSIO
    28     30   COMPOSITE_DESC?=	Enable X11 Composite extension
................................................................................
    29     31   CUE_DESC?=		Support embedded cue sheets
    30     32   CUPS_DESC?=		Enable Cups printing support
    31     33   CURL_DESC?=		Enable CURL support
    32     34   DAGRAB_DESC?=		Enable dagrab CD ripper
    33     35   DBM_DESC?=		Enable DBM support
    34     36   DBUS_DESC?=		Enable D-Bus support
    35     37   DEBUG_DESC?=		Enable debug flags
           38  +DEVD_DESC?=		Install devd files
    36     39   DOCS_DESC?=		Build and install the documentation
           40  +DOXYGEN_DESC?=		Build documentation with doxygen
    37     41   DV_DESC?=		Enable libDV support
           42  +DVDCSS_DESC?=		Enable libdvdcss support
    38     43   ECW_DESC?=		Enable ECW support
    39     44   ESOUND_DESC?=		Enable Esound sound server support
    40     45   EXAMPLES_DESC?=		Build and install the examples
    41     46   EXPAT_DESC?=		Enable Expat support
    42     47   FAAC_DESC?=		Enable FAAC encoder support
    43     48   FAAD_DESC?=		Enable FAAD aac decoder support
    44     49   FASTCGI_DESC?=		Enable FastCGI support
................................................................................
    47     52   FONTCONFIG_DESC?=	Enable Font configuration API for X
    48     53   FPECTL_DESC?=		Enable floating point exception handling
    49     54   FREETDS_DESC?=		Enable FreeTDS support
    50     55   FREETYPE_DESC?=		Enable TrueType font rendering engine
    51     56   FUSE_DESC?=		Enable Fuse support
    52     57   GCONF_DESC?=		Enable gconf backend
    53     58   GDM_DESC?=		Build GDM login manager
           59  +GEOIP_DESC?=		Enable GeoIP support
    54     60   GEOS_DESC?=		Enable GEOS support
    55     61   GEOTIFF_DESC?=		Enable GeoTIFF support
    56         -GEOIP_DESC?=		Enable GeoIP support
    57     62   GIF_DESC?=		Enable GIF support
    58     63   GLADE_DESC?=		Enable Glade interface support
           64  +GMP_DESC?=		Enable GMP support
    59     65   GNOME_DESC?=		Enable GNOME Desktop support
    60     66   GNOMEVFS2_DESC?=	Enable GnomeVFS2 support
    61     67   GNUPG_DESC?=		Enable GNU Privacy Guard support
    62     68   GNUPLOT_DESC?=		Enable plotting using gnuplot
           69  +GNUTLS_DESC?=		Enable SSL/TLS support via GnuTLS
    63     70   GOGO_DESC?=		Enable gogo mp3 encoder
           71  +GPERFTOOLS_DESC?=	Enable Google gperftools support
    64     72   GRAPHVIZ_DESC?=		Enable Graphviz support
    65     73   GRASS_DESC?=		Enable GRASS support
    66     74   GSM_DESC?=		Enable GSM codec support
    67     75   GSTREAMER_DESC?=	Enable multimedia support
    68     76   GTK2_DESC?=		Enable GTK2 gui toolkit support
    69     77   GTK3_DESC?=		Enable GTK3 gui toolkit support
    70     78   GUI_DESC?=		Enable GUI support
           79  +GUILE_DESC?=		Enable Guile support
    71     80   GVFS_DESC?=		Enable remote access support
    72     81   H323_DESC?=		Enable H323 support
    73     82   HAL_DESC?=		Enable HAL support
    74     83   HDF5_DESC?=		Enable HDF-5 support
    75     84   HTTPD_DESC?=		Support for httpd output streaming
    76     85   ICONS_DESC?=		Enable Icons theme
    77     86   ICONV_DESC?=		Enable ICONV support
    78     87   ID3_DESC?=		Enable support for id3 tags
    79     88   ID3TAG_DESC?=		Support ID3 v1/v2 tags
    80     89   IDN_DESC?=		Enable IDN (International Domain Names) support
           90  +IMLIB_DESC?=		Enable imlib image library support
    81     91   IMLIB2_DESC?=		Enable imlib2 image library support
    82     92   IPV6_DESC?=		Enable IPv6 support
    83     93   JABBER_DESC?=		Enable Jabber support
    84     94   JACK_DESC?=		Support JACK audio server
    85     95   JASPER_DESC?=		Enable JPEG 2000 support via JasPer
    86     96   JAVA_DESC?=		Enable JAVA platform support
    87     97   JPEG_DESC?=		Enable JPEG support
................................................................................
    91    101   KML_DESC?=		Enable KML support
    92    102   LADSPA_DESC?=		Enable LDSPA audio support
    93    103   LAME_DESC?=		Enable lame mp3 encoder support
    94    104   LASH_DESC?=		Enable LDASH audio support
    95    105   LASTFM_DESC?=		Support Last.FM stream input
    96    106   LCMS2_DESC?=		Enable LCMS2 support
    97    107   LDAP_DESC?=		Enable LDAP support
          108  +LFS_DESC?=		Enable Large Files Support
    98    109   LIBBLURAY_DESC?=	Enable libbluray support
          110  +LIBEXIF?=		Enable libexif support
    99    111   LIBEXTRACTOR_DESC?=	Enable libextractor support
          112  +LIBMNG_DESC?=		Enable libmng support
          113  +LIBPAPER_DESC?=		Enable libpaper support
          114  +LIBRSVG2_DESC?=		Enable librsvg-2 support
          115  +LIBWMF_DESC?=		Enable libwmf support
          116  +LIBWRAP_DESC?=		Enable TCP wrapper support
          117  +LIBXINE_DESC?=		Enable linxine support
   100    118   LIRC_DESC?=		Enable LIRC support
   101    119   LUA_DESC?=		Enable LUA support
   102    120   MAD_DESC?=		Enable Mad mp3 decoder support
   103    121   MAGICK_DESC?=		Enable ImageMagick Library
   104    122   MANPAGES_DESC?=		Build and install man pages
          123  +MDNSRESPONDER_DESC?=	Support Zeroconf through mDNSResponder
   105    124   MIKMOD_DESC?=		Support MOD audio format
   106    125   MIXER_DESC?=		Enable Mixer support
   107    126   MMKEYS_DESC?=		Enable multimedia keys support
   108    127   MMS_DESC?=		Support MMS stream input
   109    128   MMX_DESC?=		Enable MMX optimized routines
   110    129   MODPERL_DESC?=		Enable mod_perl support
   111    130   MODPLUG_DESC?=		Support MODPLUG decoder
   112    131   MOTIF_DESC?=		Enable Motif widget library
   113    132   MP4_DESC?=		Enable support for mp4
          133  +MPLAYER_DESC?=		Enable support for mplayer
   114    134   MPP_DESC?=		Enable support for musepack
   115    135   MSQL_DESC?=		Enable msql backend
   116    136   MTP_DESC?=		Enable MTP device support
   117    137   MULTIBYTE_DESC?=	Enable multibyte character support
   118    138   MUSEPACK_DESC?=		Support MPC audio format
   119    139   MYSQL_DESC?=		Enable MySQL backend
   120    140   NAS_DESC?=		Enable Network Audio System support
   121    141   NETCDF_DESC?=		Enable NetCDF support
   122    142   NLS_DESC?=		Build and install the localisation data
   123    143   NOTIFY_DESC?=		Enable startup notification support
   124    144   ODBC_DESC?=		Enable ODBC backend
   125    145   ODF_DESC?=		Enable ODF support
   126    146   OPENGL_DESC?=		Enable OpenGL support
          147  +OPENSSL_DESC?=		Enable SSL support via OpenSSL
   127    148   OPTIMIZED_CFLAGS_DESC?=	Enable compilation optimizations
   128    149   ORACLE_DESC?=		Enable Oracle support
   129    150   OSS_DESC?=		Enable Open Sound System support
          151  +PAM_DESC?=		Enable PAM support
   130    152   PCRE_DESC?=		Enable regular expressions using libpcre
   131    153   PERL_DESC?=		Enable Perl scripting language support
   132    154   PGSQL_DESC?=		Enable PostgreSQL backend
   133    155   PHP_DESC?=		Enable PHP binding/support
   134    156   PIXBUF_DESC?=		Enable gdk-pixbuf support
   135    157   PNG_DESC?=		Enable PNG support
   136    158   POPPLER_DESC?=		Enable PDF and PS support
................................................................................
   150    172   SAMPLERATE_DESC?=	Support sample rate conversion
   151    173   SASL_DESC?=		Enable SASL support
   152    174   SDL_DESC?=		Enable Simple Direct Madia Layer support
   153    175   SEM_DESC?=		Enable POSIX semaphores support
   154    176   SHOUTCAST_DESC?=	Support for Ogg Icecast and Shoutcast
   155    177   SIMD_DESC?=		Use cpu-specific optimizations if possible
   156    178   SMB_DESC?=		Enable SMB protocol support
          179  +SNAPPY_DESC?=		Enable Snappy support
   157    180   SNDFILE_DESC?=		Add support for libsndfile
   158    181   SNMP_DESC?=		Enable SNMP support
   159    182   SPANDSP_DESC?=		Enable Spandsp faxing support
   160    183   SPEEX_DESC?=		Enable support for speex audio format
   161    184   SQLITE_DESC?=		Enable SQLite backend
   162    185   SSE_DESC?=		Enable SSE optimized routines
   163    186   SSH_DESC?=		Enable SSH support
   164    187   SSL_DESC?=		Enable SSL support
   165    188   STATIC_DESC?=		Build static executable/libraries
   166    189   SVG_DESC?=		Enable SVG image support
   167    190   SVN_DESC?=		Enable Subversion support
          191  +SZIP_DESC?=		Enable Szip support
          192  +TCL_DESC?=		Enable TCL scripting language support
   168    193   THREADS_DESC?=		Enable thread support
   169    194   TIDY_DESC?=		Enable tidy html cleaner support
   170    195   TIFF_DESC?=		Enable TIFF support
   171    196   TINYXML_DESC?=		Enable XML Parser support via TinyXML
          197  +TK_DESC?=		Enable TK toolkit support
   172    198   TOMCAT5_DESC?=		Enable Tomcat 5.x support
   173    199   TOMCAT6_DESC?=		Enable Tomcat 6.x support
   174    200   TOMCAT7_DESC?=		Enable Tomcat 7.x support
   175    201   TREMOR_DESC?=		Support Tremor
   176    202   UCS2_DESC?=		Enable Unicode UCS-2 support
   177    203   UCS4_DESC?=		Enable Unicode UCS-4 support
          204  +UPNP_DESC?=		Enable UPnP support
   178    205   VAAPI_DESC?=		Enable VAAPI support
   179    206   VDPAU_DESC?=		Enable VDPAU support
   180    207   VORBIS_DESC?=		Enable support for Ogg Vorbis
   181    208   VPX_DESC?=		Enable VP8 video codec
   182    209   WAV_DESC?=		Support WAV audio format
   183    210   WAVPACK_DESC?=		Enable WavPack support
   184    211   WEBP_DESC?=		Enable WebP support

Changes to ports/Mk/bsd.pkgng.mk.

   209    209   			${ECHO_CMD} -n " $${pkgname}"; \
   210    210   		fi; \
   211    211   	done); \
   212    212   	if [ -n "$${conflicts_with}" ]; then \
   213    213   		${ECHO_MSG}; \
   214    214   		${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s): "; \
   215    215   		for entry in $${conflicts_with}; do \
   216         -			${ECHO_MSG} "      $${found}"; \
          216  +			${ECHO_MSG} "      $${entry}"; \
   217    217   		done; \
   218    218   		${ECHO_MSG}; \
   219    219   		${ECHO_MSG} "      They install files into the same place."; \
   220    220   		${ECHO_MSG} "      Please remove them first with pkg_delete(1)."; \
   221    221   		exit 1; \
   222    222   	fi
   223    223   .endif # defined(DEFER_CONFLICTS_CHECK)

Changes to ports/Mk/bsd.port.mk.

  4787   4787   		fi \
  4788   4788   	 done)
  4789   4789   .endif
  4790   4790   .endif
  4791   4791   
  4792   4792   .if !target(fetch-urlall-list)
  4793   4793   fetch-urlall-list:
  4794         -	@LISTALL=yes ${MAKE} fetch-url-list-int
         4794  +	@cd ${.CURDIR} && LISTALL=yes ${MAKE} fetch-url-list-int
  4795   4795   .endif
  4796   4796   
  4797   4797   .if !target(fetch-url-list)
  4798   4798   fetch-url-list:
  4799         -	@${MAKE} fetch-url-list-int
         4799  +	@cd ${.CURDIR} && ${MAKE} fetch-url-list-int
  4800   4800   .endif
  4801   4801   
  4802   4802   # Generates patches.
  4803   4803   
  4804   4804   update-patches:
  4805   4805   	@toedit=`PATCH_WRKSRC=${PATCH_WRKSRC} \
  4806   4806   		PATCHDIR=${PATCHDIR} \
................................................................................
  6081   6081   .if !empty(_CHECK_CONFIG_ERROR)
  6082   6082   	@echo -n "Config is invalid. Re-edit? [Y/N] "; \
  6083   6083   	read answer; \
  6084   6084   	case $$answer in \
  6085   6085   	[Nn]|[Nn][Oo]) \
  6086   6086   		exit 0; \
  6087   6087   	esac; \
  6088         -	${MAKE} config
         6088  +	cd ${.CURDIR} && ${MAKE} config
  6089   6089   .endif
  6090   6090   .endif # sanity-config
  6091   6091   
  6092   6092   .if !target(pre-config)
  6093   6093   pre-config:
  6094   6094   _COMPLETE_OPTIONS_LIST:=	${ALL_OPTIONS}
  6095   6095   .for opt in ${ALL_OPTIONS}
................................................................................
  6172   6172   		${ECHO_MSG} "===>  Switching to root credentials to write ${OPTIONSFILE}"; \
  6173   6173   		${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \
  6174   6174   		${ECHO_MSG} "===>  Returning to user credentials"; \
  6175   6175   	else \
  6176   6176   		${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \
  6177   6177   	fi; \
  6178   6178   	${RM} -f $${TMPOPTIONSFILE}
  6179         -	@${MAKE} sanity-config
         6179  +	@cd ${.CURDIR} && ${MAKE} sanity-config
  6180   6180   .endif
  6181   6181   .endif # config
  6182   6182   
  6183   6183   .if !target(config-recursive)
  6184   6184   config-recursive:
  6185   6185   	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
  6186   6186   	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \