Index: head/Mk/Uses/iconv.mk =================================================================== --- head/Mk/Uses/iconv.mk (revision 398995) +++ head/Mk/Uses/iconv.mk (revision 398996) @@ -1,69 +1,69 @@ # $FreeBSD$ # # handle dependency on the iconv port # # Feature: iconv # Usage: USES=iconv or USES=iconv:ARGS # Valid ARGS: lib (default, implicit), build, patch, # wchar_t (port uses "WCHAR_T" extension), # translit (port uses "//TRANSLIT" extension) # # MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_ICONV_MK) _INCLUDE_USES_ICONV_MK= yes .if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit} ICONV_CMD= ${LOCALBASE}/bin/iconv ICONV_LIB= -liconv ICONV_PREFIX= ${LOCALBASE} ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE} ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE} ICONV_INCLUDE_PATH= ${LOCALBASE}/include ICONV_LIB_PATH= ${LOCALBASE}/lib/libiconv.so .if ${iconv_ARGS:Mbuild} BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv .elif ${iconv_ARGS:Mpatch} PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv .else LIB_DEPENDS+= libiconv.so:${PORTSDIR}/converters/libiconv .endif .else ICONV_CMD= /usr/bin/iconv ICONV_LIB= ICONV_PREFIX= /usr ICONV_CONFIGURE_ARG= ICONV_CONFIGURE_BASE= ICONV_INCLUDE_PATH= /usr/include ICONV_LIB_PATH= /usr/lib/libc.so .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \ || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ || exists(${LOCALBASE}/include/iconv.h) -BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv +BUILD_DEPENDS+= libiconv>=1.14_9:${PORTSDIR}/converters/libiconv CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG OBJCFLAGS+= -DLIBICONV_PLUG ICONV_INCLUDE_PATH= ${LOCALBASE}/include .endif .endif # These are the most common names for the iconv-related variables found in # CMake-based ports. We set them here via CMAKE_ARGS to make sure that the best # combination is always used (ie. we prefer the version in libc whenever it is # available, and sometimes have to fall back to the iconv.h header from ports # while still using the library from base). CMAKE_ARGS+= -DICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \ -DICONV_LIBRARIES=${ICONV_LIB_PATH} \ -DICONV_LIBRARY=${ICONV_LIB_PATH} \ -DLIBICONV_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \ -DLIBICONV_LIBRARIES=${ICONV_LIB_PATH} \ -DLIBICONV_LIBRARY=${ICONV_LIB_PATH} .endif Index: head/audio/deadbeef/Makefile =================================================================== --- head/audio/deadbeef/Makefile (revision 398995) +++ head/audio/deadbeef/Makefile (revision 398996) @@ -1,192 +1,192 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= deadbeef PORTVERSION= 0.6.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ MAINTAINER= vg@FreeBSD.org COMMENT= Ultimate music player for Unix-like systems LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual GNU_CONFIGURE= yes USES= desktop-file-utils execinfo gettext gmake iconv libtool \ pkgconfig shebangfix tar:bzip2 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-alsa --disable-nullout --disable-gtk3 --disable-static CPPFLAGS+= -I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \ -I../../plugins/gme/game-music-emu-0.6pre \ -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lexecinfo -lintl USE_GNOME= intltool INSTALLS_ICONS= yes SHEBANG_FILES= yasmwrapper.sh INSTALL_TARGET= install-strip OPTIONS_DEFINE= MAD PULSEAUDIO GUI VFS LASTFM ART SUPEREQ SID FFAP VTX \ HOTKEYS OGG FFMPEG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY \ MUSEPACK WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC NLS M3U \ PSF ADPLUG DSP MONO2STEREO CONVERTER VFS_ZIP ALAC PLTBROWSER \ WMA OPTIONS_DEFAULT= MAD GUI VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \ OGG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY MUSEPACK \ WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC M3U PSF ADPLUG DSP \ MONO2STEREO CONVERTER VFS_ZIP HOTKEYS ALAC PLTBROWSER WMA PULSEAUDIO_DESC= PulseAudio output plugin (unsupported) GUI_DESC= Standard GTK+2 user interface plugin VFS_DESC= HTTP streaming VFS plugin LASTFM_DESC= Last.fm/Libre.fm scrobbler plugin ART_DESC= Cover artwork loader plugin SUPEREQ_DESC= SuperEQ DSP plugin (equalizer) SID_DESC= Commodore 64 SID music player plugin FFAP_DESC= ${APE_DESC} VTX_DESC= VTX ZX-Spectrum music player plugin ADPLUG_DESC= AdPlug audio format (OPL2/OPL3) support HOTKEYS_DESC= Local and global hotkeys support GME_DESC= Chiptune music support (based on GME) DUMB_DESC= D.U.M.B. plugin for MOD, S3M, etc. NOTIFY_DESC= OSD notification support in GTKUI plugin WILDMIDI_DESC= WildMIDI synthesizer plugin SHN_DESC= Shorten waveform encoder support AO_DESC= Audio Overload (vintage hardware sound) plugin SHELLEXEC_DESC= Shell commands execution plugin M3U_DESC= M3U and PLS playlist format support PSF_DESC= AOSDK-based PSF(,QSF,SSF,DSF) plugin DSP_DESC= High-quality sample rate conversion support MONO2STEREO_DESC= Mono to stereo converter DSP plugin CONVERTER_DESC= Plugin for converting files from/to any formats VFS_ZIP_DESC= Play files directly from ZIP archives PLTBROWSER_DESC= Playlist browser GUI plugin OPTIONS_SUB= yes MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad MAD_CONFIGURE_OFF= --disable-mad PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-pulse GUI_USE= gnome=gtk20,glib20 GUI_CONFIGURE_OFF= --disable-gtkui --disable-gtk3 GUI_IMPLIES= CONVERTER VFS_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl VFS_CONFIGURE_OFF= --disable-vfs-curl LASTFM_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl LASTFM_CONFIGURE_OFF= --disable-lfm ART_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libImlib2.so:${PORTSDIR}/graphics/imlib2 ART_USES= jpeg ART_CONFIGURE_OFF= --disable-artwork --disable-artwork-imlib2 ART_IMPLIES= VFS SUPEREQ_CONFIGURE_OFF= --disable-supereq SID_CONFIGURE_OFF= --disable-sid FFAP_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm FFAP_CONFIGURE_OFF= --disable-ffap VTX_CONFIGURE_OFF= --disable-vtx ADPLUG_CONFIGURE_OFF= --disable-adplug HOTKEYS_CONFIGURE_OFF= --disable-hotkeys OGG_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis OGG_CONFIGURE_OFF= --disable-vorbis FFMPEG_LIB_DEPENDS= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \ libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 \ libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 FFMPEG_CONFIGURE_ENABLE= ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_OFF= --disable-flac SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile SNDFILE_CONFIGURE_OFF= --disable-sndfile WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack WAVPACK_CONFIGURE_OFF= --disable-wavpack CDDA_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio \ libcddb.so:${PORTSDIR}/audio/libcddb CDDA_CONFIGURE_OFF= --disable-cdda GME_CONFIGURE_OFF= --disable-gme DUMB_CONFIGURE_OFF= --disable-dumb NOTIFY_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib NOTIFY_CONFIGURE_OFF= --disable-notify MUSEPACK_CONFIGURE_OFF= --disable-musepack WILDMIDI_RUN_DEPENDS= ${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats WILDMIDI_CONFIGURE_OFF= --disable-wildmidi TTA_CONFIGURE_OFF= --disable-tta DCA_CONFIGURE_OFF= --disable-dca AAC_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad AAC_CONFIGURE_OFF= --disable-aac MMS_CONFIGURE_OFF= --disable-mms SHN_CONFIGURE_OFF= --disable-shn AO_CONFIGURE_OFF= --disable-ao SHELLEXEC_CONFIGURE_ARGS+= --disable-shellexec NLS_CONFIGURE_OFF= --disable-nls M3U_CONFIGURE_OFF= --disable-m3u SPF_CONFIGURE_OFF= --disable-psf DSP_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate DSP_CONFIGURE_OFF= --disable-src MONO2STEREO_CONFIGURE_OFF= --disable-mono2stereo CONVERTER_CONFIGURE_OFF= --disable-converter VFS_ZIP_LIB_DEPENDS= libzip.so:${PORTSDIR}/archivers/libzip VFS_ZIP_CONFIGURE_OFF= --disable-vfs-zip ALAC_CONFIGURE_OFF= --disable-alac PLTBROWSER_CONFIGURE_OFF= --disable-pltbrowser WMA_CONFIGURE_OFF= --disable-wma post-patch: # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches) @${REINPLACE_CMD} -e 's, -lsupc++,,' \ ${WRKSRC}/plugins/adplug/Makefile.in \ ${WRKSRC}/plugins/gme/Makefile.in \ ${WRKSRC}/plugins/sid/Makefile.in \ ${WRKSRC}/plugins/supereq/Makefile.in @${REINPLACE_CMD} -e 's,/etc/timidity++/timidity-freepats.cfg:/etc/timidity/freepats.cfg:/etc/timidity/,${LOCALBASE}/share/,' \ ${WRKSRC}/plugins/wildmidi/wildmidiplug.c @${REINPLACE_CMD} \ -e 's,libavcodec ,libavcodec0 ,g' \ -e 's,libavutil ,libavutil0 ,g' \ -e 's,libavformat ,libavformat0 ,g' \ -e '/HAVE_OGG" = "yes"/ {n; n; /HAVE_VORBISPLUGIN=yes/d;}' \ ${WRKSRC}/configure # Fix build with libzip-1.0 @${REINPLACE_CMD} 's,zip_file_t,zip_file_DB,g' \ ${WRKSRC}/plugins/vfs_zip/vfs_zip.c .include Index: head/audio/deadbeef/files/patch-junklib.c =================================================================== --- head/audio/deadbeef/files/patch-junklib.c (nonexistent) +++ head/audio/deadbeef/files/patch-junklib.c (revision 398996) @@ -0,0 +1,10 @@ +--- junklib.c.orig 2014-07-31 19:03:51 UTC ++++ junklib.c +@@ -32,7 +32,6 @@ + #include + #include + #if HAVE_ICONV +- #define LIBICONV_PLUG + #include + #elif HAVE_ICU + #warning icu Property changes on: head/audio/deadbeef/files/patch-junklib.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/hidapi/Makefile =================================================================== --- head/comms/hidapi/Makefile (revision 398995) +++ head/comms/hidapi/Makefile (revision 398996) @@ -1,24 +1,30 @@ # $FreeBSD$ PORTNAME= hidapi DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 0.8.0-rc1 PORTREVISION= 3 CATEGORIES= comms MAINTAINER= tijl@FreeBSD.org COMMENT= Library to access USB HID-class devices LICENSE= BSD3CLAUSE GPLv3 LICENSE_COMB= dual USE_GITHUB= yes GH_ACCOUNT= signal11 -USES= autoreconf iconv:wchar_t libtool +USES= autoreconf gettext-tools iconv:wchar_t libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * + +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib + +pre-configure: + @${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC} .include Index: head/comms/hidapi/files/patch-configure.ac =================================================================== --- head/comms/hidapi/files/patch-configure.ac (revision 398995) +++ head/comms/hidapi/files/patch-configure.ac (revision 398996) @@ -1,11 +1,18 @@ ---- configure.ac.orig +--- configure.ac.orig 2013-10-06 22:43:37 UTC +++ configure.ac -@@ -94,6 +94,8 @@ - LIBS="${LIBS}" +@@ -89,11 +89,11 @@ case $host in + os="freebsd" + threads="pthreads" + +- CFLAGS="$CFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +- LIBS="${LIBS}" AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb]) - AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv]) +- AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv]) + AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include ]]) + AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include ]]) ++ AM_ICONV ++ LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} ${LTLIBICONV}" echo libs_priv: $LIBS_LIBUSB_PRIVATE ;; *-mingw*) Index: head/comms/hidapi/files/patch-libusb-hid.c =================================================================== --- head/comms/hidapi/files/patch-libusb-hid.c (revision 398995) +++ head/comms/hidapi/files/patch-libusb-hid.c (revision 398996) @@ -1,32 +1,45 @@ ---- libusb/hid.c.orig +--- libusb/hid.c.orig 2013-10-06 22:43:37 UTC +++ libusb/hid.c @@ -25,6 +25,8 @@ #define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */ +#include + /* C */ #include #include -@@ -250,7 +252,7 @@ +@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des } #endif /* INVASIVE_GET_USAGE */ -#ifdef __FreeBSD__ +#if ! HAVE_DECL_LIBUSB_GET_STRING_DESCRIPTOR /* The FreeBSD version of libusb doesn't have this funciton. In mainline libusb, it's inlined in libusb.h. This function will bear a striking resemblence to that one, because there's about one way to code it. -@@ -757,7 +757,11 @@ +@@ -333,11 +335,7 @@ static wchar_t *get_usb_string(libusb_de + size_t inbytes; + size_t outbytes; + size_t res; +-#ifdef __FreeBSD__ +- const char *inptr; +-#else +- char *inptr; +-#endif ++ ICONV_CONST char *inptr; + char *outptr; + + /* Determine which language to use. */ +@@ -757,7 +755,11 @@ static void *read_thread(void *param) libusb_cancel_transfer(dev->transfer); while (!dev->cancelled) +#if HAVE_DECL_LIBUSB_HANDLE_EVENTS_COMPLETED libusb_handle_events_completed(usb_context, &dev->cancelled); +#else + libusb_handle_events(usb_context); +#endif /* Now that the read thread is stopping, Wake any threads which are waiting on data (in hid_read_timeout()). Do this under a mutex to Index: head/converters/libiconv/Makefile =================================================================== --- head/converters/libiconv/Makefile (revision 398995) +++ head/converters/libiconv/Makefile (revision 398996) @@ -1,44 +1,44 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= converters devel MASTER_SITES= GNU MAINTAINER= gnome@FreeBSD.org COMMENT= Character set conversion library GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ --disable-nls \ --docdir=${DOCSDIR} \ am_cv_func_iconv=no INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes USES= libtool USE_CSTD= gnu89 USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS ENCODINGS PATCHES OPTIONS_DEFAULT=ENCODINGS ENCODINGS_DESC= Include extra character sets PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS ENCODINGS_CONFIGURE_ENABLE= extra-encodings PATCHES_PATCH_SITES= http://apolloron.org/software/libiconv-1.14-ja/ \ LOCAL/kwm PATCHES_PATCHFILES= ${DISTNAME}-ja-1.patch.gz:-p1 post-patch: @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h @${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \ ${WRKSRC}/libcharset/configure \ ${WRKSRC}/preload/configure post-install: ${LN} -s libiconv.so.2 ${STAGEDIR}${PREFIX}/lib/libiconv.so.3 .include Index: head/converters/libiconv/files/patch-lib-iconv.c =================================================================== --- head/converters/libiconv/files/patch-lib-iconv.c (revision 398995) +++ head/converters/libiconv/files/patch-lib-iconv.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/iconv.c.orig -+++ lib/iconv.c -@@ -598,7 +598,7 @@ - It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'. */ - #define strong_alias(name, aliasname) _strong_alias(name, aliasname) - #define _strong_alias(name, aliasname) \ -- extern __typeof (name) aliasname __attribute__ ((alias (#name))); -+ extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name))); - #undef iconv_open - #undef iconv - #undef iconv_close Property changes on: head/converters/libiconv/files/patch-lib-iconv.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/fbreader/Makefile =================================================================== --- head/deskutils/fbreader/Makefile (revision 398995) +++ head/deskutils/fbreader/Makefile (revision 398996) @@ -1,67 +1,73 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= fbreader PORTVERSION= 0.99.6 DISTVERSIONSUFFIX= -freebsdport -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MAINTAINER= ports@FreeBSD.org COMMENT= Powerful e-book reader LICENSE= GPLv2 # or later LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libunibreak.so:${PORTSDIR}/textproc/libunibreak USE_GITHUB= yes GH_ACCOUNT= geometer GH_PROJECT= FBReader .if defined(WITH_DEBUG) STATUS= debug .else STATUS= release .endif USES= compiler gmake iconv pkgconfig tar:tgz USE_LDCONFIG= yes USE_SQLITE= yes INSTALL_TARGET= do_install CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \ ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \ LD="${CXX}" MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= GTK2 QT4 OPTIONS_DEFAULT= QT4 OPTIONS_SUB= yes GTK2_USE= gnome=gtk20 GTK2_MAKE_ENV= UI_TYPE=gtk QT4_USE= qt4=gui,corelib,imageformats,network,moc_build QT4_LDFLAGS= -L${QT_LIBDIR} QT4_MAKE_ENV= UI_TYPE=qt4 post-patch: - @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \ - -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ + @${REINPLACE_CMD} -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ ${WRKSRC}/makefiles/arch/desktop.mk @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \ ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/zlibrary/text/Makefile @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ -e 's,make ,gmake ,' + +pre-configure: +# This cannot be done in post-patch because build dependencies are installed +# after patching and they can pull in libiconv which can affect CFLAGS in +# Mk/Uses/iconv.mk. + @${REINPLACE_CMD} 's|^CFLAGS =.*$$|CFLAGS = ${CFLAGS}|' \ + ${WRKSRC}/makefiles/arch/desktop.mk .include Index: head/deskutils/ljclive/Makefile =================================================================== --- head/deskutils/ljclive/Makefile (revision 398995) +++ head/deskutils/ljclive/Makefile (revision 398996) @@ -1,24 +1,22 @@ # Created by: johans # $FreeBSD$ PORTNAME= ljclive PORTVERSION= 0.4.10 PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME} DISTNAME= clive-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Command line client for posting LiveJournal entries USES= iconv GNU_CONFIGURE= yes +CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFLICTS= *clive-[1-9]* -.include - -post-patch: - @${REINPLACE_CMD} 's/iconv "iconv/"iconv/' ${WRKSRC}/configure - -.include +.include Index: head/deskutils/owncloudclient/Makefile =================================================================== --- head/deskutils/owncloudclient/Makefile (revision 398995) +++ head/deskutils/owncloudclient/Makefile (revision 398996) @@ -1,56 +1,57 @@ # Created by: Mathieu Arnold # $FreeBSD$ PORTNAME= owncloudclient PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://download.owncloud.com/desktop/stable/ MAINTAINER= yonas@fizk.net COMMENT= OwnCloud Desktop Syncing Client LICENSE= GPLv2 LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \ libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5 -USES= cmake:outsource compiler:c++11-lib gmake pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gmake iconv pkgconfig tar:xz USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build webkit xml USE_OPENSSL= yes USE_SQLITE= 3 CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx DOCS_USE= tex=dvipsk:build,latex:build DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON PLIST_SUB= VERSION=${PORTVERSION} .include .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes # CMake 3.3.x will use $PATH when looking for headers and libraries by default, # and OpenSSL from base will end up being used. Make sure ${LOCALBASE} is # preferred over $PATH. CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) .include Index: head/deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake =================================================================== --- head/deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake (nonexistent) +++ head/deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake (revision 398996) @@ -0,0 +1,13 @@ +--- cmake/modules/FindIconv.cmake.orig 2015-07-09 17:51:37 UTC ++++ cmake/modules/FindIconv.cmake +@@ -36,9 +36,7 @@ find_library(ICONV_LIBRARY + ) + + if (ICONV_LIBRARY) +- get_filename_component(_ICONV_NAME ${ICONV_LIBRARY} NAME) +- get_filename_component(_ICONV_PATH ${ICONV_LIBRARY} PATH) +- check_library_exists(${_ICONV_NAME} iconv ${_ICONV_PATH} HAVE_ICONV) ++ set(HAVE_ICONV TRUE) + else() + check_function_exists(iconv HAVE_ICONV) + endif() Property changes on: head/deskutils/owncloudclient/files/patch-cmake-modules-FindIconv.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/aegis/Makefile =================================================================== --- head/devel/aegis/Makefile (revision 398995) +++ head/devel/aegis/Makefile (revision 398996) @@ -1,65 +1,65 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= aegis PORTVERSION= 4.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF DISTVERSIONSUFFIX= .D510 MAINTAINER= aryeh.friedman@gmail.com COMMENT= Transaction-based software configuration management system LICENSE= GPLv3 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= tkdiff:${PORTSDIR}/textproc/tkdiff USES= gettext ghostscript perl5 tk USE_GNOME= libxml2 USE_GCC= any GNU_CONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale" CONFIGURE_ENV= WISH="${WISH}" LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes # XXX Manpages are installed into ${DATADIR} too -- there's no easy way to # stop this because we don't have Makefile.am provided. Maintainer will # sort this with upstream. PORTDATA= * PORTDOCS= * .include post-patch: # Avoid "2>/dev/null" redirect in csh (ends up with empty manpath). @${REINPLACE_CMD} -Ee 's|(MANPATH_PROG) 2>/dev/null|\1|' \ ${WRKSRC}/configure # Fix path to Tk interpreter. @cd ${WRKSRC}/script && ${REINPLACE_CMD} -e 's|wish |${WISH} |' \ aebuffy.in aecomp.in aexver.in tkaeca.in tkaegis.in tkaenc.in \ tkaepa.in tkaer.in xaegis.in # Import global variable "datadir" inside function (not found otherwise). @${REINPLACE_CMD} -e 's|global lib|& datadir|' \ ${WRKSRC}/script/xaegis.in post-configure: .if empty(PORT_OPTIONS:MNLS) ${REINPLACE_CMD} -e 's|HAVE_MSGFMT = yes|HAVE_MSGFMT = no|' \ ${WRKSRC}/Makefile .endif post-install: ${MKDIR} -p ${STAGEDIR}${PREFIX}/com/aegis # Fails to reinstall because keeps track of created directories, so make it # forget that, by recreating them on each install. @${FIND} ${WRKSRC} -type f -name ".*dir" -delete .include Index: head/devel/libexplain/Makefile =================================================================== --- head/devel/libexplain/Makefile (revision 398995) +++ head/devel/libexplain/Makefile (revision 398996) @@ -1,40 +1,49 @@ # Created by: Emanuel Haupt # $FreeBSD$ PORTNAME= libexplain PORTVERSION= 1.3.${PATCHLEVEL} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R} DISTNAME= ${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= Library which may be used to explain Unix and Linux system call errors LICENSE= LGPL3 # or later LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof -USES= bison gettext ghostscript:build gmake libtool:build +USES= bison gettext ghostscript:build gmake iconv libtool:build GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_linux_kd_h=no USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib PATCHLEVEL= D012 OPTIONS_DEFINE= DOCS +.include + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no +.else +CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes ac_cv_func_iconv_close=yes \ + ac_cv_lib_iconv_iconv=yes +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|$$(libdir)/pkgconfig|$$(libdir)/../libdata/pkgconfig|g ; \ s|\([[:blank:]]\)sed|\1gsed|g' ${WRKSRC}/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexplain.so -.include +.include Index: head/devel/sdl20/Makefile =================================================================== --- head/devel/sdl20/Makefile (revision 398995) +++ head/devel/sdl20/Makefile (revision 398996) @@ -1,196 +1,202 @@ # $FreeBSD$ PORTNAME= sdl2 PORTVERSION= 2.0.3 PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= Cross-platform multimedia development API LICENSE= ZLIB GNU_CONFIGURE= yes USES= gmake iconv libtool pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-video-opengles \ --disable-altivec \ --disable-arts \ --enable-diskaudio \ --enable-dummyaudio \ --enable-video-dummy \ --disable-dbus \ --disable-input-tslib \ --disable-rpath .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} CONFIGURE_ARGS+= --enable-mmx .else CONFIGURE_ARGS+= --disable-mmx .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:M3dnow} CONFIGURE_ARGS+= --enable-3dnow .else CONFIGURE_ARGS+= --disable-3dnow .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} CONFIGURE_ARGS+= --enable-sse .else CONFIGURE_ARGS+= --disable-sse .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2} CONFIGURE_ARGS+= --enable-sse2 .else CONFIGURE_ARGS+= --disable-sse2 .endif CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND NAS OSS \ PULSEAUDIO PTHREADS SDL_ATOMIC SDL_AUDIO \ SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \ SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \ SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_OPENGL VIDEO_X11 OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \ SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \ SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \ SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_OPENGL VIDEO_X11 ALSA_DESC= Audio output via the ALSA audio architecture DLOPEN_DESC= Use dlopen for loading 3rd party libraries ESOUND_DESC= Audio output via the EsounD sound server NAS_DESC= Audio output via the Network Audio System OSS_DESC= Audio output via the Open Sound System PULSEAUDIO_DESC= Audio output via the PulseAudio sound server PTHREADS_DESC= Use POSIX threads for multi-threading SDL_ATOMIC_DESC= Enable the SDL Atomic subsystem SDL_AUDIO_DESC= Enable the SDL Audio subsystem SDL_CPUINFO_DESC= Enable the SDL CPUinfo subsystem SDL_EVENTS_DESC= Enable the SDL Events subsystem SDL_FILE_DESC= Enable the SDL File subsystem SDL_HAPTIC_DESC= Enable the SDL Haptic subsystem SDL_JOYSTICK_DESC= Enable the SDL Joystick subsystem SDL_LOADSO_DESC= Enable the SDL Loadso subsystem SDL_POWER_DESC= Enable the SDL Power subsystem SDL_RENDER_DESC= Enable the SDL Render subsystem SDL_THREADS_DESC= Enable the SDL Threads subsystem SDL_TIMERS_DESC= Enable the SDL Timers subsystem SDL_VIDEO_DESC= Eanble the SDL Video subsystem VIDEO_OPENGL_DESC= OpenGL rendering support VIDEO_X11_DESC= X11 rendering support ASM_CONFIGURE_ENABLE= assembly DLOPEN_CONFIGURE_ENABLE= sdl-dlopen PTHREADS_CONFIGURE_ENABLE= pthreads pthreads-sem SDL_ATOMIC_CONFIGURE_ENABLE= atomic gcc-atomics SDL_AUDIO_CONFIGURE_ENABLE= audio SDL_CPUINFO_CONFIGURE_ENABLE= cpuinfo SDL_EVENTS_CONFIGURE_ENABLE= events SDL_FILE_CONFIGURE_ENABLE= filesystem SDL_HAPTIC_CONFIGURE_ENABLE= haptic SDL_JOYSTICK_CONFIGURE_ENABLE= joystick SDL_LOADSO_CONFIGURE_ENABLE= loadso SDL_POWER_CONFIGURE_ENABLE= power SDL_RENDER_CONFIGURE_ENABLE= render SDL_THREADS_CONFIGURE_ENABLE= threads SDL_TIMERS_CONFIGURE_ENABLE= timers SDL_VIDEO_CONFIGURE_EANBLE= video .include .if ${PORT_OPTIONS:MALSA} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ALSA requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-alsa --enable-alsa-shared LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-alsa --disable-alsa-shared .endif .if ${PORT_OPTIONS:MESOUND} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ESOUND requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-esd --enable-esd-shared USE_GNOME+= esound .else CONFIGURE_ARGS+= --disable-esd --disable-esd-shared .endif .if ${PORT_OPTIONS:MNAS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option NAS requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-nas --enable-nas-shared LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas .else CONFIGURE_ARGS+= --disable-nas --disable-nas-shared .endif .if ${PORT_OPTIONS:MOSS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option OSS requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-oss .else CONFIGURE_ARGS+= --disable-oss .endif .if ${PORT_OPTIONS:MPULSEAUDIO} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option PULSEAUDIO requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-pulseaudio --enable-pulseaudio-shared .else CONFIGURE_ARGS+= --disable-pulseaudio --disable-pulseaudio-shared .endif .if ${PORT_OPTIONS:MVIDEO_OPENGL} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_OPENGL requires SDL_VIDEO .endif CONFIGURE_ARGS+= --enable-video-opengl USE_GL= gl .else CONFIGURE_ARGS+= --disable-video-opengl .endif .if ${PORT_OPTIONS:MVIDEO_X11} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_X11 requires SDL_VIDEO .endif CONFIGURE_ARGS+= --enable-video-x11 \ --enable-x11-shared \ --enable-video-x11-xcursor \ --enable-video-x11-xinerama \ --enable-video-x11-xinput \ --enable-video-x11-xrandr \ --enable-video-x11-scrnsaver \ --enable-video-x11-xshape \ --enable-video-x11-vm USE_XORG+= xinerama xcursor xi xrandr xscrnsaver xxf86vm xext .else CONFIGURE_ARGS+= --disable-video-x11 \ --disable-x11-shared \ --disable-video-x11-xcursor \ --disable-video-x11-xinerama \ --disable-video-x11-xinput \ --disable-video-x11-xrandr \ --disable-video-x11-scrnsaver \ --disable-video-x11-xshape \ --disable-video-x11-vm .endif +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=yes ac_cv_func_iconv=yes +.endif + post-patch: @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \ -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure # Clang does not provide _m_prefetch @${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \ ${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c -.include +.include Index: head/emulators/vmw/Makefile =================================================================== --- head/emulators/vmw/Makefile (revision 398995) +++ head/emulators/vmw/Makefile (revision 398996) @@ -1,57 +1,60 @@ # $FreeBSD$ PORTNAME= vmw PORTVERSION= 060510 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://sites.google.com/site/chitchatvmback/storage/ MAINTAINER= dinoex@FreeBSD.org COMMENT= VM Back Command Line Tools for VMware ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME}/src USES= iconv MAKE_ENV+= __MAKE_CONF=/dev/null ASFLAGS="${ASFLAGS}" MAKE_ENV+= LD="${CC}" SBINS= vmw vmshrink vmftp OPTIONS_DEFINE= DOCS PORTDOCS= README-eucj.TXT README-sjis.TXT README.TXT .for i in ${SBINS} PORTDOCS+= ${i}-eucj.txt ${i}-sjis.txt ${i}.txt .endfor .for i in ${SBINS} PLIST_FILES+= sbin/${i} .endfor .include .if ${ARCH} == amd64 .if !exists(/usr/lib32/libc.so) IGNORE= please install lib32 .endif -.if ${OSVERSION} < 1000000 +.if !empty(ICONV_LIB) IGNORE= needs 32bit libiconv .endif CFLAGS+= -m32 ASFLAGS+= --32 LDFLAGS+= -m32 -B/usr/lib32 -L/usr/lib32 LD= ${CC} .endif -.if ${OSVERSION} > 1000000 +.if empty(ICONV_LIB) FTPLIB= MAKE_ENV+= FTPLIB="${FTPLIB}" +.else +CFLAGS+= -I${LOCALBASE}/include .endif do-install: .for i in ${SBINS} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/ .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/.. && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/) .include Index: head/emulators/vmw/files/patch-vmshf.c =================================================================== --- head/emulators/vmw/files/patch-vmshf.c (nonexistent) +++ head/emulators/vmw/files/patch-vmshf.c (revision 398996) @@ -0,0 +1,17 @@ +--- vmshf.c.orig 2006-05-10 04:36:12 UTC ++++ vmshf.c +@@ -306,14 +306,7 @@ static uint32_t LocalToUtf8(char *dst, c + unix systems with iconv.h + -- use iconv() for code conversion + */ +-#ifdef __FreeBSD__ +-#include +-#include +-typedef size_t iconv_t; +-#else /* __FreeBSD__ */ + #include +-#endif /* __FreeBSD__ */ +- + #include + #include + #include Property changes on: head/emulators/vmw/files/patch-vmshf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/scrollz/Makefile =================================================================== --- head/irc/scrollz/Makefile (revision 398995) +++ head/irc/scrollz/Makefile (revision 398996) @@ -1,49 +1,55 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= scrollz PORTVERSION= 2.2.3 PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://www.netraam.net/scrollz/download/ \ http://www.scrollz.org/download/ DISTNAME= ScrollZ-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced ircII client that supports scripts, colors, and more LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= gmake iconv ncurses GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ipv6 --enable-regexp --enable-utf8 PLIST_SUB= SCROLLZ_VER="${PORTVERSION}" OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_USES= pkgconfig GNUTLS_CONFIGURE_ON= --with-ssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ENV+=ac_cv_func_iconv_open=yes +.endif + post-patch: @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure pre-build: .if !defined(BATCH) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \ SZdist.c) @(cd ${WRKSRC} && ./SZdist) .endif post-install: .for i in scrollz-${PORTVERSION} wservz @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor -.include +.include Index: head/japanese/chasen-base/Makefile =================================================================== --- head/japanese/chasen-base/Makefile (revision 398995) +++ head/japanese/chasen-base/Makefile (revision 398996) @@ -1,29 +1,34 @@ # Created by: kuriyama # $FreeBSD$ PORTNAME= chasen PORTVERSION= 2.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese textproc MASTER_SITES= SOURCEFORGE_JP/chasen-legacy/56305 PKGNAMESUFFIX= -base MAINTAINER= ports@FreeBSD.org COMMENT= Japanese Morphological Analysis System BUILD_DEPENDS= ${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include ${ICONV_CONFIGURE_BASE} USES= iconv libtool USE_LDCONFIG= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} \ + -e 's/iconv ()/libiconv ()/' \ + -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/chasen/dic ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/manual* ${STAGEDIR}${DOCSDIR} .include Index: head/japanese/eb/Makefile =================================================================== --- head/japanese/eb/Makefile (revision 398995) +++ head/japanese/eb/Makefile (revision 398996) @@ -1,100 +1,99 @@ # Created by: Motoyuki Kasahara # $FreeBSD$ PORTNAME= eb PORTVERSION= 4.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \ ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ DISTFILES= ${EBFILES} \ ${APPENDIXFILES} EXTRACT_ONLY= ${EBFILES} MAINTAINER= yasu@utahime.org COMMENT= C library for accessing EB, EBG, EBXA, and EPWING CD-ROM dictionaries LICENSE= BSD3CLAUSE EBFILES= ${DISTNAME}${EXTRACT_SUFX} APPENDIXFILES= appendix/cencro-1.0.tar.gz \ appendix/chujiten-2.3.tar.gz \ appendix/chujiten2-2.0.tar.gz \ appendix/chujiten6-2.3.tar.gz \ appendix/colloc-2.0.tar.gz \ appendix/crownfj-2.0.tar.gz \ appendix/crownfj2-1.0.tar.gz \ appendix/crowngj-1.0.tar.gz \ appendix/daihyakka-1.0.tar.gz \ appendix/daijirin-2.0.tar.gz \ appendix/dd75-2.0.tar.gz \ appendix/gendai2000-1.0.tar.gz \ appendix/genius-1.0.tar.gz \ appendix/genius2-1.1.tar.gz \ appendix/global-2.0.tar.gz \ appendix/heritage-2.2.tar.gz \ appendix/hyogen-1.0.tar.gz \ appendix/izumi-2.0.tar.gz \ appendix/jitenban-2.4.tar.gz \ appendix/jitenban97-2.1.tar.gz \ appendix/kanjigen-2.0.tar.gz \ appendix/kanjigen2-2.0.tar.gz \ appendix/kojien-2.3.tar.gz \ appendix/kojien2-2.0.tar.gz \ appendix/kojien4-2.2.tar.gz \ appendix/oxford-2.0.tar.gz \ appendix/plus-2.0.tar.gz \ appendix/readers-2.2.tar.gz \ appendix/readers2-2.0.tar.gz \ appendix/ruigigo-1.0.tar.gz \ appendix/superdic98-1.0.tar.gz DIST_SUBDIR= eb PORTDOCS= eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html eb-06.html \ eb-07.html eb-08.html eb-09.html eb-10.html eb-11.html eb-12.html \ eb-13.html eb-14.html eb.html ebappendix-01.html ebappendix-02.html \ ebappendix-03.html ebappendix-04.html ebappendix.html ebfont-01.html \ ebfont-02.html ebfont-03.html ebfont-04.html ebfont.html \ ebinfo-01.html ebinfo-02.html ebinfo-03.html ebinfo-04.html \ ebinfo-05.html ebinfo.html ebrefile-01.html ebrefile-02.html \ ebrefile-03.html ebrefile.html ebstopcode-01.html ebstopcode-02.html \ ebstopcode-03.html ebstopcode.html ebzip-01.html ebzip-02.html \ ebzip-03.html ebzip-04.html ebzip-05.html ebzip-06.html ebzip-07.html \ ebzip-08.html ebzip-09.html ebzip-10.html ebzip.html USES= autoreconf iconv libtool perl5 tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} +CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \ + --with-iconv-includes=${ICONV_PREFIX}/include \ + --with-iconv-libraries=${ICONV_PREFIX}/lib CONFIGURE_ENV= ac_cv_path_PERL=${PERL} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes APPENDIXDIR= ${DATADIR}/appendix NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NLS_CONFIGURE_ON= \ - --with-gettext-includes=${LOCALBASE}/include \ - --with-gettext-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${ICONV_PREFIX}/include \ - --with-iconv-libraries=${ICONV_PREFIX}/lib +NLS_CONFIGURE_ON= --with-gettext-includes=${LOCALBASE}/include \ + --with-gettext-libraries=${LOCALBASE}/lib NLS_CONFIGURE_OFF= --disable-nls post-extract: ${RM} -fr ${WRKSRC}/zlib ${MKDIR} ${WRKDIR}/appendix .for file in ${APPENDIXFILES} ${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \ ${DISTDIR}/${DIST_SUBDIR}/${file} .endfor post-install: (cd ${WRKDIR}/appendix && ${COPYTREE_SHARE} . ${STAGEDIR}${APPENDIXDIR} ) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libeb.so .include Index: head/japanese/eb/files/patch-m4-gettext-m4 =================================================================== --- head/japanese/eb/files/patch-m4-gettext-m4 (revision 398995) +++ head/japanese/eb/files/patch-m4-gettext-m4 (revision 398996) @@ -1,80 +1,79 @@ ---- m4/gettext.m4.orig 2010-01-03 21:26:04.000000000 +0900 -+++ m4/gettext.m4 2014-04-03 10:20:12.000000000 +0900 -@@ -87,13 +87,19 @@ +--- m4/gettext.m4.orig 2010-01-03 12:26:04 UTC ++++ m4/gettext.m4 +@@ -86,14 +86,17 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl + save_CPPFLAGS=$CPPFLAGS save_LIBS=$LIBS CPPFLAGS="$save_CPPFLAGS $iconv_includes" - LIBS="$save_LIBS $iconv_libraries" +- LIBS="$save_LIBS $iconv_libraries" - AC_CHECK_LIB(iconv, iconv_open, - [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"]) - AC_CHECK_FUNCS(iconv_open locale_charset) - AC_CHECK_HEADERS(iconv.h libcharset.h) - if test $ac_cv_func_iconv_open != no; then - ICONVINCS="$iconv_includes" - fi -+ initial_LIBS="$LIBS" -+ AC_SEARCH_LIBS([iconv_open], -+ [iconv], -+ [AS_IF([test "$LIBS" = "$initial_LIBS"], -+ [AC_CHECK_HEADERS([iconv.h]) -+ AC_CHECK_FUNCS([iconv_open]) -+ ICONVLIBS="$iconv_libraries" -+ ICONVINCS="$iconv_includes"], -+ [AC_CHECK_LIB([charset], [locale_charset]) -+ AC_CHECK_HEADERS([iconv.h libcharset.h]) -+ AC_CHECK_FUNCS([iconv_open locale_charset]) -+ ICONVLIBS="$iconv_libraries -lcharset -liconv" -+ ICONVINCS="$iconv_includes"])]) ++ AC_CHECK_HEADER([iconv.h], ++ [AC_DEFINE([HAVE_ICONV_H],[1],[Have iconv.h]) ++ for l in '' -liconv; do ++ LIBS="$save_LIBS $iconv_libraries $l" ++ AC_LINK_IFELSE( ++ AC_LANG_PROGRAM([#include ],[iconv_open("","")]), ++ [AC_DEFINE([HAVE_ICONV_OPEN],[1],[Have iconv_open(3)]) ++ ICONVINCS="$iconv_includes" ++ ICONVLIBS="$iconv_libraries $l" ++ break],[]) ++ done],[]) CPPFLAGS=$save_CPPFLAGS LIBS=$save_LIBS AC_SUBST(ICONVINCS) -@@ -113,10 +119,10 @@ +@@ -113,10 +116,10 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl save_LIBS=$LIBS dnl * - dnl * Test 1: Try to link both libintl and libiconv. + dnl * Test 1: Try to link libc only. dnl * - CPPFLAGS="$save_CPPFLAGS $gettext_includes" - LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv" + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" AC_LINK_IFELSE([ #include #ifdef ENABLE_NLS -@@ -143,8 +149,8 @@ +@@ -143,8 +146,8 @@ main() try_nls=yes, try_nls=no) if test "$try_nls" = yes; then - INTLINCS="$gettext_includes" - INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv" + INTLINCS= + INTLLIBS= fi dnl * -@@ -222,11 +228,11 @@ +@@ -222,11 +225,11 @@ main() fi dnl * - dnl * Test 4: Try to link libc only. + dnl * Test 4: Try to link both libintl and libiconv. dnl * if test "$try_nls" = no; then - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS $gettext_includes" + LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv" AC_LINK_IFELSE([ #include #ifdef ENABLE_NLS -@@ -253,8 +259,8 @@ +@@ -253,8 +256,8 @@ main() try_nls=yes, try_nls=no) if test "$try_nls" = yes; then - INTLINCS= - INTLLIBS= + INTLINCS="$gettext_includes" + INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv" fi fi Index: head/japanese/eblook/Makefile =================================================================== --- head/japanese/eblook/Makefile (revision 398995) +++ head/japanese/eblook/Makefile (revision 398996) @@ -1,36 +1,40 @@ # Created by: Shigeyuki Fukushima # $FreeBSD$ PORTNAME= eblook PORTVERSION= 1.6.1 PORTREVISION= 8 CATEGORIES= japanese textproc MASTER_SITES= http://openlab.ring.gr.jp/edict/eblook/dist/ DIST_SUBDIR= eb MAINTAINER= yasu@utahime.org COMMENT= Command to lookup words in EB format dictionaries LICENSE= GPLv2 LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb USES= iconv -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-eb-conf=${PREFIX}/etc/eb.conf +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-eb-conf=${PREFIX}/etc/eb.conf CPPFLAGS+= -I${ICONV_PREFIX}/include -LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} +LIBS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} INFO= eblook PLIST_FILES= bin/eblook PORTDOCS= AUTHORS COPYING ChangeLog NEWS README OPTIONS_DEFINE= DOCS -.include +.include +.if !empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_func_iconv=yes +.endif + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/java/jikes/Makefile =================================================================== --- head/java/jikes/Makefile (revision 398995) +++ head/java/jikes/Makefile (revision 398996) @@ -1,21 +1,22 @@ # Created by: Matthew Dillon # $FreeBSD$ PORTNAME= jikes PORTVERSION= 1.22 PORTREVISION= 2 CATEGORIES= java MASTER_SITES= SF/${PORTNAME}/Jikes/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Java source to byte-code compiler made available by IBM PLIST_SUB= PORTVERSION=${PORTVERSION} GNU_CONFIGURE= yes -CONFIGURE_ARGS= ac_cv_search_libiconv_open=no +CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB} \ + ac_cv_search_libiconv_open=no USES= iconv gmake tar:bzip2 CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .include Index: head/multimedia/transcode/Makefile =================================================================== --- head/multimedia/transcode/Makefile (revision 398995) +++ head/multimedia/transcode/Makefile (revision 398996) @@ -1,161 +1,161 @@ # Created by: Hendrik Scholz # $FreeBSD$ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Text-console utility for video stream processing LICENSE= GPLv2 LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg USE_LDCONFIG= yes USES= gmake libtool pkgconfig tar:bzip2 USE_GCC= any WANT_SDL= yes WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-oss CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \ XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \ FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV BKTR_DESC= Bktr capture card support POSTPROC_DESC= Libpostproc support DVDREAD_DESC= Libdvdread support LZO_DESC= LZO compression support X11_USE= xorg=xv,xaw,xpm X11_CONFIGURE_WITH= x MPEG2_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 libmpeg2convert BKTR_CONFIGURE_ENABLE= bktr POSTPROC_CONFIGURE_ENABLE= libpostproc FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype2 LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= lame LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE} XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= xvid XVID_CONFIGURE_ON= --with-xvid-prefix=${LOCALBASE} X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= x264 OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg OGG_CONFIGURE_ENABLE= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= vorbis THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= theora DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= libdvdread DVDREAD_CONFIGURE_ON= --with-libdvdread-prefix=${LOCALBASE} DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv DV_CONFIGURE_ENABLE= libdv QUICKTIME_LIB_DEPENDS= libquicktime.so:${PORTSDIR}/multimedia/libquicktime QUICKTIME_CONFIGURE_ENABLE= libquicktime LZO_LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2 LZO_CONFIGURE_ENABLE= lzo LZO_CONFIGURE_ON= --with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52-prefix=${LOCALBASE} FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= faac FAAC_CONFIGURE_ON= --with-faac-prefix=${LOCALBASE} LIBXML2_USE= GNOME=libxml2 LIBXML2_CONFIGURE_ENABLE= libxml2 MJPEGTOOLS_LIB_DEPENDS= liblavjpeg.so:${PORTSDIR}/multimedia/mjpegtools MJPEGTOOLS_CONFIGURE_ENABLE= mjpegtools SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl SDL_CONFIGURE_ENV_ON= SDL_CONFIG="${SDL_CONFIG}" IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= libjpeg JPEG_CONFIGURE_ON= --with-libjpeg-prefix=${LOCALBASE} ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv ICONV_CONFIGURE_ON= --with-iconv-prefix=${ICONV_PREFIX} V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_CONFIGURE_ENABLE= v4l .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif post-extract: @${RM} ${WRKSRC}/import/v4l/videodev* post-patch: @${REINPLACE_CMD} -E -e 's|loff_t|uint64_t|' ${WRKSRC}/avilib/avidump.c @${REINPLACE_CMD} -E -e 's|> ${TMPPLIST}) .include Index: head/net/asterisk11/Makefile =================================================================== --- head/net/asterisk11/Makefile (revision 398995) +++ head/net/asterisk11/Makefile (revision 398996) @@ -1,268 +1,270 @@ # $FreeBSD$ PORTNAME= asterisk PORTVERSION= 11.20.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ asterisk/old-releases/:main \ sounds/releases/:g729 PKGNAMESUFFIX= 11 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 USES= bison cpe gmake iconv localbase ncurses shebangfix USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes USE_SQLITE= 3 USE_RC_SUBR= asterisk GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OSVERSION=${OSVERSION} \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" \ ASTLDFLAGS="${LDFLAGS}" MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS_BUILD= linuxthreads-* pjsip-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13* OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \ SYSINFO UUID XMPP OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GCC GSM LUA MP3PLAYER NEWT ODBC PGSQL \ RADIUS SNMP SPEEX SQLITE2 UUID VORBIS XMPP OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_SINGLE= COMPILER OPTIONS_SINGLE_COMPILER= BASE GCC COMPILER_DESC= Compiler to use OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL SQLITE2 DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface OPTIONS_GROUP+= SOUNDS OPTIONS_GROUP_SOUNDS= G729 SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.4.27.tar.gz ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz G729_DESC= Install G.729 format sounds G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \ ${ASTERISK_MOH_G729_SOUNDS}:g729 BACKTRACE_DESC= Stack backtrace support via (lib)execinfo BASE_DESC= Use base compiler (experimental) DAHDI_DESC= DAHDI support EXCHANGE_DESC= Exchange calendar support GCC_DESC= Use gcc from ports MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC= New G711 codec OOH323_DESC= ooh323 support SRTP_DESC= SecureRTP support SYSINFO_DESC= Use devel/libsysinfo to get system information UUID_DESC= libuuid support (required for ICE and TURN in RTP) XMPP_DESC= XMPP/GTALK support OPTIONS_SUB= yes BACKTRACE_CONFIGURE_WITH= execinfo BACKTRACE_LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds GCC_USE= GCC=yes GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USE= MYSQL=yes MP3PLAYER_RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 NCURSES_USES= ncurses NEWT_LIB_DEPENDS= libnewt.so:${PORTSDIR}/devel/newt ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ libltdl.so:${PORTSDIR}/devel/libltdl OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323 OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ libh323_r.so:${PORTSDIR}/net/openh323 OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323 PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 SRTP_CONFIGURE_WITH= srtp SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE} UUID_CONFIGURE_OFF= --disable-uuid UUID_CONFLICTS= ossp-uuid-[0-9]* VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ ASTERISK_GROUP=${ASTERISK_GROUP} \ VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete .if ${PORT_OPTIONS:MG729} ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds .endif post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample + @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure .if ${PORT_OPTIONS:MSYSINFO} @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile .else @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile .endif .if exists(${FILESDIR}/.asterisk.makeopts) USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts .else USER_MAKEOPTS_FILE= .endif post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}" @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts .endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif pre-build: @${MKDIR} ${WRKSRC}/res/pjproject/pjnath/lib ${WRKSRC}/res/pjproject/pjlib-util/lib \ ${WRKSRC}/res/pjproject/pjlib/lib post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST}); .include Index: head/net/c3270/Makefile =================================================================== --- head/net/c3270/Makefile (revision 398995) +++ head/net/c3270/Makefile (revision 398996) @@ -1,118 +1,118 @@ # Created by: pdseniura@techie.com # $FreeBSD$ PORTNAME= c3270 PORTVERSION= 3.3.14ga11 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://x3270.bgp.nu/download/03.03.14/ MASTER_SITES_VER_PATH= ${PORTVERSION:C/(0[0-9]\.0[0-9])/} EXTRACT_SUFX= -src.tgz MAINTAINER= araujo@FreeBSD.org COMMENT= Full-screen curses-based remote login to IBM mainframes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/} GNU_CONFIGURE= yes -CONFIGURE_ARGS= ac_cv_search_libiconv=no +CONFIGURE_ARGS= ac_cv_search_libiconv=${ICONV_LIB} USES= iconv readline gmake USE_OPENSSL= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # c3270's ./configure script supports these. # Within it all options except DBCS are enabled by default. OPTIONS_DEFINE= OPENSSL READLINE PR3287 ANSI APL DBCS FT LOCAL_PROCESS \ PRINTER SCRIPT TN3270E TRACE DOCS OPTIONS_DEFAULT= OPENSSL READLINE PR3287 ANSI APL FT LOCAL_PROCESS \ PRINTER SCRIPT TN3270E TRACE PR3287_DESC= Build pr3287 component ANSI_DESC= Include NVT (ANSI) support APL_DESC= Include APL support DBCS_DESC= Include EBCDIC DBCS support FT_DESC= Include IND\$$FILE support LOCAL_PROCESS_DESC= Include Local Process support PRINTER_DESC= Include printer session support SCRIPT_DESC= Include scripting support TN3270E_DESC= Include TN3270-Extended support TRACE_DESC= Include trace support .include .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif .if ! ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+= --disable-ssl .undef USE_OPENSSL .endif .if ! ${PORT_OPTIONS:MREADLINE} CONFIGURE_ARGS+= --without-readline .undef USE_READLINE .endif .if ! ${PORT_OPTIONS:MANSI} CONFIGURE_ARGS+= --disable-ansi .endif .if ! ${PORT_OPTIONS:MAPL} CONFIGURE_ARGS+= --disable-apl .endif # EBCDIC double-byte character set support is disabled by default .if ${PORT_OPTIONS:MDBCS} CONFIGURE_ARGS+= --enable-dbcs PLIST_SUB+= DBCS="" .else PLIST_SUB+= DBCS="@comment " .endif .if ! ${PORT_OPTIONS:MFT} CONFIGURE_ARGS+= --disable-ft .endif .if ! ${PORT_OPTIONS:MLOCAL_PROCESS} CONFIGURE_ARGS+= --disable-local-process .endif .if ! ${PORT_OPTIONS:MPRINTER} CONFIGURE_ARGS+= --disable-printer .endif .if ! ${PORT_OPTIONS:MSCRIPT} CONFIGURE_ARGS+= --disable-script .endif .if ! ${PORT_OPTIONS:MTN3270E} CONFIGURE_ARGS+= --disable-tn3270e .endif .if ! ${PORT_OPTIONS:MTRACE} CONFIGURE_ARGS+= --disable-trace .endif post-install: @${INSTALL_MAN} ${WRKSRC}/c3270.man \ ${STAGEDIR}${MANPREFIX}/man/man1/c3270.1 @${INSTALL_MAN} ${WRKSRC}/x3270-script.man \ ${STAGEDIR}${MANPREFIX}/man/man1/x3270-script.1 @${INSTALL_MAN} ${WRKSRC}/x3270if.man \ ${STAGEDIR}${MANPREFIX}/man/man1/x3270if.1 @${INSTALL_MAN} ${WRKSRC}/ibm_hosts.man \ ${STAGEDIR}${MANPREFIX}/man/man5/ibm_hosts.5 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${DOCSDIR}/${i} .endfor @${ECHO_MSG} "===> Extra Documentation installed in ${DOCSDIR}/html ." .endif .include Index: head/net/samba4/Makefile =================================================================== --- head/net/samba4/Makefile (revision 398995) +++ head/net/samba4/Makefile (revision 398996) @@ -1,530 +1,530 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}4 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba41-4.1.* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.0.26 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \ --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off (if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb BUILD_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asynchronous IO support DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support SWAT_DESC= SWAT WebGUI UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate .else CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MSWAT} CONFIGURE_ARGS+= --with-swat PLIST_SUB+= SWAT="" .else CONFIGURE_ARGS+= --without-swat PLIST_SUB+= SWAT="@comment " .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rid.8 idmap_tdb.8 \ idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool.8 \ smbta-util.8 swat.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_full_audit.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` @${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net/samba41/Makefile =================================================================== --- head/net/samba41/Makefile (revision 398995) +++ head/net/samba41/Makefile (revision 398996) @@ -1,526 +1,526 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}41 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.1.18 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \ --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off (if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # ldb BUILD_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asynchronous IO support DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate .else CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8 \ vfs_linux_xfs_sgid.8 vfs_btrfs.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` @${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net/samba42/Makefile =================================================================== --- head/net/samba42/Makefile (revision 398995) +++ head/net/samba42/Makefile (revision 398996) @@ -1,529 +1,529 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}42 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.2.4 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off(if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # Libarchive BUILD_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # ldb BUILD_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update (require ADS) EXP_MODULES_DESC= Experimental modules FAM_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate .else CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 python_OLD_CMD= /usr/bin/env python SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \ vfs_linux_xfs_sgid.8 vfs_btrfs.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` @${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net-mgmt/icinga-classicweb/Makefile =================================================================== --- head/net-mgmt/icinga-classicweb/Makefile (revision 398995) +++ head/net-mgmt/icinga-classicweb/Makefile (revision 398996) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= icinga-classicweb +PORTREVISION= 1 DISTNAME= icinga-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Classic web interface for Icinga 1 and 2 .include "${.CURDIR}/../icinga-core/Makefile.common" LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd CONFIGURE_ARGS+=--disable-idoutils CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= classicui-standalone INSTALL_TARGET= install-classicui-standalone install-classicui-standalone-conf post-patch: @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \ ${WRKSRC}/html/Makefile.in # Use correct make(1) syntax to unbreak parallel builds @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#' post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${ICINGAWWWDIR}/ssi .include Index: head/net-mgmt/icinga-core/Makefile.common =================================================================== --- head/net-mgmt/icinga-core/Makefile.common (revision 398995) +++ head/net-mgmt/icinga-core/Makefile.common (revision 398996) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTVERSION= 1.13.3 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/ MAINTAINER= lme@FreeBSD.org LICENSE= GPLv2 LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl -USES= cpe gmake iconv perl5 +USES= cpe gmake perl5 GNU_CONFIGURE= yes ICINGAUSER?= icinga ICINGAGROUP?= icinga USERS= ${ICINGAUSER} GROUPS= ${ICINGAGROUP} ICINGADIR?= /var/spool/icinga ICINGALOGDIR?= /var/log/icinga ICINGAWWWDIR?= www/icinga ICINGAHTMURL?= /icinga ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin ETCDIR= ${PREFIX}/etc/icinga CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \ --with-command-group=${WWWGRP} \ --with-icinga-user=${ICINGAUSER} \ --with-icinga-group=${ICINGAGROUP} \ --with-htmurl=${ICINGAHTMURL} \ --with-cgiurl=${ICINGACGIURL} \ --sbindir=${PREFIX}/${ICINGAWWWDIR}/cgi-bin \ --datarootdir=${PREFIX}/${ICINGAWWWDIR} \ --datadir=${PREFIX}/${ICINGAWWWDIR} \ --sysconfdir=${PREFIX}/etc/icinga \ --localstatedir=${ICINGADIR} \ --with-checkresult-dir=${ICINGADIR}/checkresults \ --libexecdir=${PREFIX}/libexec/icinga \ --with-plugin-dir=${LOCALBASE}/libexec/nagios \ --with-log-dir=${ICINGALOGDIR} \ --with-httpd-conf=${EXAMPLESDIR}/apache2 \ --enable-event-broker \ --enable-nanosleep \ + ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} \ HOME=${WRKDIR} # prevent creation of .rnd file MAKE_ARGS= INSTALL_OPTS= INSTALL_OPTS_WEB= COMMAND_OPTS= PLIST_SUB= ICINGADIR=${ICINGADIR} \ ICINGALOGDIR=${ICINGALOGDIR} \ ICINGAWWWDIR=${ICINGAWWWDIR} \ ICINGAUSER=${ICINGAUSER} \ ICINGAGROUP=${ICINGAGROUP} \ ICINGAHTMURL=${ICINGAHTMURL} \ ICINGACGIURL=${ICINGACGIURL} \ WWWGRP=${WWWGRP} SUB_FILES= pkg-message # XXX: Don't remove PREFIX from SUB_LIST here. SUB_LIST= PREFIX=${PREFIX} \ ${PLIST_SUB} - Index: head/net-mgmt/netxms/Makefile =================================================================== --- head/net-mgmt/netxms/Makefile (revision 398995) +++ head/net-mgmt/netxms/Makefile (revision 398996) @@ -1,93 +1,96 @@ # Created by: Vladimir Ermakov # $FreeBSD$ PORTNAME= netxms PORTVERSION= 1.2.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.netxms.org/download/ \ http://www.netxms.org/download/archive/ MAINTAINER= bofh@FreeBSD.org COMMENT= Network monitoring system LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi PORTSCOUT= limit:^1\. OPTIONS_DEFINE= SERVER CLIENT AGENT OPTIONS_DEFAULT= CLIENT AGENT SERVER_ENABLED_MODULES= MYSQL SERVER_DISABLED_MODULES= PGSQL SQLITE ODBC OPTIONS_SINGLE= SERVER OPTIONS_SINGLE_SERVER= ${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES} OPTIONS_SUB= yes SERVER_DESC= Install NetXMS server & agent CLIENT_DESC= Install NetXMS client AGENT_DESC= Install NetXMS agent CLIENT_CONFIGURE_ON= --with-client AGENT_CONFIGURE_ON= --with-agent SERVER_CONFIGURE_ON= --with-server MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USE= MYSQL=yes PGSQL_CONFIGURE_ON= --with-pgsql PGSQL_USES= pgsql SQLITE_CONFIGURE_ON= --with-sqlite SQLITE_USE= SQLITE=yes ODBC_CONFIGURE_ON= --with-odbc ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC USE_OPENSSL= yes USES= gmake iconv libtool perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules \ --with-internal-libjansson \ --with-internal-libtre USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USERS= netxms GROUPS= netxms .include .if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MCLIENT} PLIST_SUB+= NXMAP="" .else PLIST_SUB+= NXMAP="@comment " .endif .if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT} PLIST_SUB+= NXCP="" .else PLIST_SUB+= NXCP="@comment " .endif .if ${PORT_OPTIONS:MSERVER} USE_RC_SUBR+= netxmsd .if !${PORT_OPTIONS:MAGENT} USE_RC_SUBR+= nxagentd .endif .endif .if ${PORT_OPTIONS:MAGENT} USE_RC_SUBR+= nxagentd .endif + +post-patch: + @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure post-install: .if ${PORT_OPTIONS:MSERVER} .if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample) ${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample .endif .endif .if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT} .if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample) ${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample .endif .endif .include Index: head/net-p2p/transmission-cli/Makefile =================================================================== --- head/net-p2p/transmission-cli/Makefile (revision 398995) +++ head/net-p2p/transmission-cli/Makefile (revision 398996) @@ -1,112 +1,118 @@ # $FreeBSD$ PORTNAME= transmission PORTVERSION= 2.84 PORTREVISION?= 3 CATEGORIES?= net-p2p #MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ MASTER_SITES= http://transmission.cachefly.net/ PKGNAMESUFFIX?= -cli MAINTAINER?= jbeich@FreeBSD.org COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities SLAVEPORT?= cli LICENSE= GPLv2 .if ${SLAVEPORT} == cli LICENSE+= MIT LICENSE_COMB= multi .endif LICENSE_FILE= ${WRKSRC}/COPYING USES+= cpe tar:xz CPE_VENDOR= transmissionbt CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5* OPTIONS_DEFINE= LITE DOCS EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party .if ${SLAVEPORT} != web LIB_DEPENDS?= ${GEN_LIB_DEPENDS} # General dependencies GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \ libdht.so:${PORTSDIR}/devel/jech-dht \ libminiupnpc.so:${PORTSDIR}/net/miniupnpc \ libnatpmp.so:${PORTSDIR}/net/libnatpmp \ libutp.so:${PORTSDIR}/net/libutp \ libevent.so:${PORTSDIR}/devel/libevent2 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web # This is master port of transmission-*, so don't override USES definition USES+= gmake iconv libtool localbase pkgconfig USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -DWITH_UTP=1 LIBS+= ${ICONV_LIB} CONFIGURE_ARGS=--with-zlib=/usr \ --without-inotify \ --disable-utp \ --enable-external-natpmp \ ${EXTRA_CONF_ARGS} CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \ DHT_CFLAGS=" " \ DHT_LIBS="-ldht" \ LIBUTP_CFLAGS=" " \ LIBUTP_LIBS="-lutp" \ LIBUTP_LIBS_QT="-lutp" EXTRA_CONF_ARGS?=--enable-cli \ --disable-daemon \ --without-gtk \ --disable-mac \ --disable-nls LITE_CONFIGURE_ENABLE= lightweight EXTRA_PATCHES= ${PATCHDIR}/disable-web .endif DOCS= AUTHORS NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_func_iconv_open=yes +.endif + general-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' .if ${SLAVEPORT} != gtk @${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \ ${WRKSRC}/libtransmission/utils.h .endif @${REINPLACE_CMD} -e \ 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ s|" == "|" = "|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|doc \\| \\|g' \ ${WRKSRC}/Makefile.in .if ${SLAVEPORT} != cli @${REINPLACE_CMD} -e 's|utils \\|\\|g' \ ${WRKSRC}/Makefile.in .endif # Don't conflict with patches but force system libraries @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \ -e 's|third-party/[^ ]*Makefile||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} \ -e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \ ${WRKSRC}/qt/qtr.pro @${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in post-patch: general-patch general-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOCS}" ${STAGEDIR}${DOCSDIR}) post-install: general-install -.include +.include Index: head/www/htmlcxx/Makefile =================================================================== --- head/www/htmlcxx/Makefile (revision 398995) +++ head/www/htmlcxx/Makefile (revision 398996) @@ -1,29 +1,35 @@ # $FreeBSD$ PORTNAME= htmlcxx PORTVERSION= 0.85 PORTREVISION= 2 CATEGORIES= www textproc MASTER_SITES= SF MAINTAINER= kevlo@FreeBSD.org COMMENT= HTML and CSS APIs for C++ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/LGPL_V2 USES= bison iconv libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE=yes MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes +.endif + post-patch: @${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure -.include +.include Index: head/www/httrack/Makefile =================================================================== --- head/www/httrack/Makefile (revision 398995) +++ head/www/httrack/Makefile (revision 398996) @@ -1,52 +1,53 @@ # Created by: Dirk Froemberg # $FreeBSD$ PORTNAME= httrack PORTVERSION= 3.48.21 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.httrack.com/ \ http://mirror.httrack.com/ \ http://mirror.httrack.com/historical/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Easy-to-use offline browser utility and website copier LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual OPTIONS_DEFINE= DOCS ICONS OPTIONS_SUB= yes CONFIGURE_ARGS= --docdir=${DOCSDIR} --with-zlib=/usr CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes INSTALL_TARGET= install-strip LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/httrack USE_OPENSSL= yes USES= alias execinfo gmake iconv libtool shebangfix PORTDATA= * PORTDOCS= * SHEBANG_FILES= src/webhttrack ICONS_VARS= INSTALLS_ICONS=yes .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=no +.else +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes .endif post-patch: - @${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/html/server/div/WebHTTrack* post-install: ${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css .include Index: head/www/xapian-omega/Makefile =================================================================== --- head/www/xapian-omega/Makefile (revision 398995) +++ head/www/xapian-omega/Makefile (revision 398996) @@ -1,55 +1,55 @@ # Created by: Henrik Brix Andersen # $FreeBSD$ PORTNAME= xapian-omega PORTVERSION= 1.2.21 CATEGORIES= www MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= CGI search application built on Xapian LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libxapian.so:${PORTSDIR}/databases/xapian-core OPTIONS_DEFINE= DOCS EXAMPLES ICONV OPTIONS_DEFAULT=ICONV ICONV_DESC= Enable iconv character set conversion support PORTSCOUT= limitw:1,even CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} CONFIGURE_ENV= PCRE_CONFIG=${LOCALBASE}/bin/pcre-config \ XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USES= libtool perl5 shebangfix tar:xz MORE_PORTDOCS= AUTHORS ChangeLog NEWS README TODO PORTDATA= * PORTDOCS= * PORTEXAMPLES= omega.conf SHEBANG_FILES= dbi2omega htdig2omega mbox2omega +ICONV_CONFIGURE_ON= ac_cv_search_iconv=${ICONV_LIB} ICONV_CONFIGURE_WITH= iconv -ICONV_LDFLAGS= ${ICONV_LIB} ICONV_USES= iconv post-patch: @${REINPLACE_CMD} \ -e '/^dist_sysconf_DATA = /d' \ -e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \ ${WRKSRC}/Makefile.in post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/ .include Index: head/x11/mrxvt/Makefile =================================================================== --- head/x11/mrxvt/Makefile (revision 398995) +++ head/x11/mrxvt/Makefile (revision 398996) @@ -1,47 +1,56 @@ # Created by: David Yeske # $FreeBSD$ PORTNAME= mrxvt PORTVERSION= 0.4.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Tabbed version of rxvt LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png CONFLICTS= mrxvt-0.5.* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-lastlog --disable-wtmp +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= jpeg tar:tgz USE_XORG= x11 OPTIONS_DEFINE= DOCS JAPANESE XFT JAPANESE_CONFIGURE_ON= --enable-xim --enable-cjk --with-encoding=eucj XFT_LIB_DEPENDS= libXft.so:${PORTSDIR}/x11-fonts/libXft XFT_CONFIGURE_ENABLE= xft -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - PORTDOCS= TIPS \ README.greek \ README.menu \ README.xvt \ xdefaults-sample.txt \ xterm.seq \ mrxvt.vbs \ mrxvtset.pl -post-patch-DOCS-off: - @${REINPLACE_CMD} -e '/^\(install-data-am:\).*/ \ - s/install-docDATA //' ${WRKSRC}/doc/Makefile.in +.include +.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE} +USES+= iconv +.endif + +.include + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no +.else +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes +.endif + post-install: ${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt -.include +.include Index: head/x11/mrxvt-devel/Makefile =================================================================== --- head/x11/mrxvt-devel/Makefile (revision 398995) +++ head/x11/mrxvt-devel/Makefile (revision 398996) @@ -1,140 +1,152 @@ # Created by: Lars Engels # $FreeBSD$ PORTNAME= mrxvt-devel PORTVERSION= 0.5.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11 MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION} DISTNAME= mrxvt-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Development version of mrxvt LICENSE= GPLv2 CONFLICTS= mrxvt-0.4.* USE_XORG= x11 GNU_CONFIGURE= yes USES= shebangfix SHEBANG_FILES= ${WRKSRC}/share/scripts/mrxvtset.pl SUB_FILES+= pkg-message DESKTOP_ENTRIES= "mrxvt" "mrxvt terminal emulator" \ "${PREFIX}/share/pixmaps/mrxvt.png" \ "mrxvt" "Utility;TerminalEmulator;" \ false OPTIONS_DEFINE= XFT BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN JAPANESE 24BITS \ MENUBAR TEXTSHADOW FRILLS DOCS OPTIONS_DEFAULT= BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN 24BITS \ MENUBAR XFT JAPANESE FRILLS TEXTSHADOW BACKGROUND_DESC= Background images TRANSPARENCY_DESC= Transparent background SWAPSCREEN_DESC= Swapscreen JAPANESE_DESC= Support for Japanese language 24BITS_DESC= Prefer 24 bits color MENUBAR_DESC= Menubar TEXTSHADOW_DESC= Text shadow FRILLS_DESC= Internal borders and smart resizing .include CONFIGURE_ARGS+= --enable-utempter CONFIGURE_ARGS+= --disable-lastlog .if ${PORT_OPTIONS:MJAPANESE} CONFIGURE_ARGS+= --enable-xim --enable-cjk --with-encoding=eucj .endif .if ${PORT_OPTIONS:MXFT} USE_XORG+= xft CONFIGURE_ARGS+= --enable-xft .endif +.if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE} +USES+= iconv +.endif + .if ${PORT_OPTIONS:M24BITS} CONFIGURE_ARGS+= --enable-24bits .endif .if ! ${PORT_OPTIONS:MBACKGROUND} CONFIGURE_ARGS+= --disable-xpm .endif .if ! ${PORT_OPTIONS:MJPEG} || ! ${PORT_OPTIONS:MBACKGROUND} CONFIGURE_ARGS+= --disable-jpeg .else USES+= jpeg .endif .if ! ${PORT_OPTIONS:MPNG} || ! ${PORT_OPTIONS:MBACKGROUND} CONFIGURE_ARGS+= --disable-png .else LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png .endif .if ! ${PORT_OPTIONS:MTRANSPARENCY} CONFIGURE_ARGS+= --disable-transparency .endif .if ${PORT_OPTIONS:MMENUBAR} CONFIGURE_ARGS+= --enable-menubar .endif .if ${PORT_OPTIONS:MTEXTSHADOW} CONFIGURE_ARGS+= --enable-text-shadow .endif .if ! ${PORT_OPTIONS:MSWAPSCREEN} CONFIGURE_ARGS+= --disable-swapscreen .endif .if ${PORT_OPTIONS:MFRILLS} CONFIGURE_ARGS+= --enable-frills .endif ## Rarely used options, not in the main menu # How many lines to save in the scroll buffer .if defined(SAVE_LINES) CONFIGURE_ARGS+= --with-save-lines=${SAVE_LINES:M[0-9]*} .endif # Maximal number of terminals .if defined(MAX_TERMINALS) CONFIGURE_ARGS+= --with-max-term=${MAX_TERMINALS:M[0-9]*} .endif # Maximal number of profiles .if defined(MAX_PROFILES) CONFIGURE_ARGS+= --with-max-profiles=${MAX_PROFILES:M[0-9]*} .endif # Extra height of active tab as a percentage of the font height .if defined(EXTRA_ATAB_HEIGHT) CONFIGURE_ARGS+= --with-atab-extra=${EXTRA_ATAB_HEIGHT:M[0-9]*} .endif # The radius of tab corners as a percentage of the font X offset .if defined(TAB_RADIUS) CONFIGURE_ARGS+= --with-tab-radius=${TAB_RADIUS:M[0-9]*} .endif +.include + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no +.else +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin @for pixmap in ${WRKSRC}/share/pixmaps/* ; \ do ${INSTALL_DATA} $$pixmap ${STAGEDIR}${PREFIX}/share/pixmaps/ ; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mrxvt ${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${STAGEDIR}${PREFIX}/etc/mrxvt/mrxvtrc.sample ${INSTALL_DATA} ${WRKSRC}/share/default.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/default.menu.sample ${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/submenus.menu.sample ${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts ${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${STAGEDIR}${EXAMPLESDIR}/scripts ${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${STAGEDIR}${EXAMPLESDIR}/scripts ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} ${WRKSRC}/doc/*.bz2 ${STAGEDIR}${DOCSDIR} ${BZIP2_CMD} -d ${STAGEDIR}${DOCSDIR}/*.bz2 -.include +.include Index: head/x11/x3270/Makefile =================================================================== --- head/x11/x3270/Makefile (revision 398995) +++ head/x11/x3270/Makefile (revision 398996) @@ -1,66 +1,66 @@ # Created by: janek # $FreeBSD$ PORTNAME= x3270 PORTVERSION= 3.3.15 PORTREVISION= 2 CATEGORIES= x11 net MASTER_SITES= http://x3270.bgp.nu/download/current/ EXTRACT_SUFX= ga7-src.tgz MAINTAINER= ecrist@secure-computing.net COMMENT= 3270 Terminal emulator BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale # Conflict due to x3270if CONFLICTS= c3270-* USES= cpe iconv fonts imake:env USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fontdir=${FONTSDIR} \ --disable-dbcs \ - ac_cv_search_libiconv=no + ac_cv_search_libiconv=${ICONV_LIB} CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if defined(WITHOUT_OPENSSL) CONFIGURE_ARGS+= --disable-ssl .else USE_OPENSSL= yes .endif MAKE_ARGS+= COMPRESSMANCMD="${DO_NADA}" \ INSTALL="${INSTALL}" INSTALLFLAGS="${COPY}" \ INSTPGMFLAGS="${STRIP} -m ${BINMODE}" \ INSTBINFLAGS="-m ${BINMODE}" \ INSTDATFLAGS="-m ${SHAREMODE}" \ INSTMANFLAGS="-m ${MANMODE}" CPE_VENDOR= paul_mattes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} PORTDOCS= README README.dbcs PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES post-patch: ${REINPLACE_CMD} -e 's|\$$(INSTALL) -c|$$(INSTALL) $$(INSTALLFLAGS)|g' \ ${WRKSRC}/Imakefile.in post-install: .for m in x3270-script.man x3270.man x3270if.man @(cd ${WRKSRC} ; ${INSTALL_MAN} ${m} ${STAGEDIR}${MAN1PREFIX}/man/man1/) .endfor ${INSTALL_MAN} ${WRKSRC}/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) @(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/x11-wm/jwm/Makefile =================================================================== --- head/x11-wm/jwm/Makefile (revision 398995) +++ head/x11-wm/jwm/Makefile (revision 398996) @@ -1,80 +1,86 @@ # Created by: Babak Farrokhi # $FreeBSD$ PORTNAME= jwm PORTVERSION= 2.3.1 CATEGORIES= x11-wm MASTER_SITES= http://joewing.net/programs/jwm/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Joe's Window Manager LICENSE= GPLv2 USES= iconv pkgconfig tar:xz USE_XORG= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \ XINERAMA XMU XPM XRENDER OPTIONS_DEFAULT= JPEG NLS PNG FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER OPTIONS_SUB= yes CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_ENABLE= cairo DEBUG_CONFIGURE_ENABLE= debug FRIBIDI_DESC= Unicode Bidirectional Algorithm support FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE=fribidi JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png SVG_USE= GNOME=librsvg2 SVG_CONFIGURE_ENABLE= rsvg XEXT_DESC= X11 Shape Extension support XEXT_USE= XORG=xext XEXT_CONFIGURE_ENABLE= shape XFT_USE= XORG=xft XFT_CONFIGURE_ENABLE= xft XINERAMA_USE= XORG=xinerama XINERAMA_CONFIGURE_ENABLE=xinerama XMU_DESC= X11 Miscellaneous Utilities support XMU_USE= XORG=xmu XMU_CONFIGURE_ENABLE= xmu XPM_USE= XORG=xpm XPM_CONFIGURE_ENABLE= xpm XRENDER_DESC= X11 Render Extension support XRENDER_USE= XORG=xrender XRENDER_CONFIGURE_ENABLE=xrender .include .if ${PORT_OPTIONS:MXFT} && empty(PORT_OPTIONS:MXRENDER) IGNORE= the XFT support requires XRENDER .endif .if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT) IGNORE= the XMU support requires XEXT .endif .if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT) IGNORE= the XPM support requires XEXT .endif +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc @${REINPLACE_CMD} -e \ 's|install -m 644|@INSTALL_DATA@| ; \ s|jwmrc$$|jwmrc.sample|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/EXE/s|install|@INSTALL_PROGRAM@| ; \ /strip/s|^|#|' ${WRKSRC}/src/Makefile.in -.include +.include