diff options
61 files changed, 266 insertions, 266 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index fd188e7bf6d..2172f2e14f2 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/09/24 02:47:15 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2015/12/29 04:54:34 dholland Exp $ DISTNAME= arj-3.10.22 PKGREVISION= 2 @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arj/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://arj.sourceforge.net/ COMMENT= Open-source ARJ archiver -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index fa5b425737c..f0457095ce3 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2015/04/25 14:20:17 tnn Exp $ +# $NetBSD: Makefile,v 1.34 2015/12/29 04:54:35 dholland Exp $ DISTNAME= ark-${_KDE_VERSION} PKGREVISION= 3 @@ -12,7 +12,7 @@ CMAKE_ARGS+= -DWITH_QJSON:BOOL=OFF .include "../../meta-pkgs/kde4/kde4.mk" .include "../../archivers/bzip2/buildlink3.mk" -BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.6.0 +BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.6.0 .include "../../archivers/libarchive/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/audio/akode/Makefile.common b/audio/akode/Makefile.common index a8ea43caa28..cb23cfe14f5 100644 --- a/audio/akode/Makefile.common +++ b/audio/akode/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2013/01/27 00:13:29 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2015/12/29 04:54:35 dholland Exp $ # # used by audio/akode/Makefile # used by audio/akode-plugins-alsa/Makefile @@ -28,15 +28,15 @@ USE_TOOLS+= gmake pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes -CONFIGURE_ARGS+= --without-flac -CONFIGURE_ARGS+= --without-speex -CONFIGURE_ARGS+= --without-libmad -CONFIGURE_ARGS+= --without-libsamplerate -CONFIGURE_ARGS+= --without-jack -CONFIGURE_ARGS+= --without-polypaudio -CONFIGURE_ARGS+= --without-ffmpeg -CONFIGURE_ARGS+= --without-oss -CONFIGURE_ARGS+= --without-sun -CONFIGURE_ARGS+= --without-alsa -CONFIGURE_ARGS+= --without-vorbis +CONFIGURE_ARGS+= --without-flac +CONFIGURE_ARGS+= --without-speex +CONFIGURE_ARGS+= --without-libmad +CONFIGURE_ARGS+= --without-libsamplerate +CONFIGURE_ARGS+= --without-jack +CONFIGURE_ARGS+= --without-polypaudio +CONFIGURE_ARGS+= --without-ffmpeg +CONFIGURE_ARGS+= --without-oss +CONFIGURE_ARGS+= --without-sun +CONFIGURE_ARGS+= --without-alsa +CONFIGURE_ARGS+= --without-vorbis CONFIGURE_ARGS+= --without-mpc diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile index fcdad851e1b..e40b255e7bc 100644 --- a/audio/ampache/Makefile +++ b/audio/ampache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/12/06 12:13:12 taca Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/29 04:54:35 dholland Exp $ # DISTNAME= ampache-3.5.3 @@ -10,18 +10,18 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://ampache.org/ COMMENT= Web-based Audio file manager -DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php -DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=0:../../devel/php-gettext -DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=0:../../converters/php-iconv -DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=0:../../converters/php-mbstring -DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=0:../../databases/php-mysql +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=0:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=0:../../converters/php-iconv +DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=0:../../converters/php-mbstring +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=0:../../databases/php-mysql PHP_VERSIONS_ACCEPTED= 55 56 NO_BUILD= yes USE_LANGUAGES= # none USE_PKGLOCALEDIR= yes USE_TOOLS+= pax -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 INSTDIR= ${PREFIX}/share/ampache EGDIR= ${PREFIX}/share/examples diff --git a/audio/freeswitch-music/options.mk b/audio/freeswitch-music/options.mk index 6931cc1071a..9fa2095bf53 100644 --- a/audio/freeswitch-music/options.mk +++ b/audio/freeswitch-music/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2012/10/20 13:01:30 darcy Exp $ +# $NetBSD: options.mk,v 1.4 2015/12/29 04:54:36 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch -PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k -PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k +PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch +PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k +PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k .include "../../mk/bsd.options.mk" diff --git a/audio/freeswitch-sounds-en/Makefile b/audio/freeswitch-sounds-en/Makefile index 264237e0e69..024a6e4796d 100644 --- a/audio/freeswitch-sounds-en/Makefile +++ b/audio/freeswitch-sounds-en/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/10/21 18:50:53 darcy Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/29 04:54:36 dholland Exp $ DISTNAME= freeswitch-sounds-en-${VERSION} VERSION= 1.0.22 @@ -10,12 +10,12 @@ MAINTAINER= darcy@NetBSD.org COMMENT= FreeSwitch Sounds (English) LICENSE= mpl-1.1 -SOUNDSDIR= share/freeswitch/sounds +SOUNDSDIR= share/freeswitch/sounds USE_TOOLS+= tar INSTALLATION_DIRS+= ${SOUNDSDIR} GENERATE_PLIST+= ${FIND} ${WRKDIR}/en \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${WRKDIR}/,${SOUNDSDIR}/,g"; -NO_BUILD= yes +NO_BUILD= yes do-install: @${ECHO_MSG} "Installing files..." diff --git a/audio/freeswitch-sounds-en/options.mk b/audio/freeswitch-sounds-en/options.mk index 42884c35174..931392dde7f 100644 --- a/audio/freeswitch-sounds-en/options.mk +++ b/audio/freeswitch-sounds-en/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2012/10/21 18:50:53 darcy Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:36 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch -PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k -PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k +PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch +PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k +PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k .include "../../mk/bsd.options.mk" diff --git a/audio/freeswitch-sounds-fr/Makefile b/audio/freeswitch-sounds-fr/Makefile index ae62fd9a9ee..f62401c0bd1 100644 --- a/audio/freeswitch-sounds-fr/Makefile +++ b/audio/freeswitch-sounds-fr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/21 18:52:58 darcy Exp $ +# $NetBSD: Makefile,v 1.3 2015/12/29 04:54:36 dholland Exp $ DISTNAME= freeswitch-sounds-fr-${VERSION} VERSION= 1.0.18 @@ -6,16 +6,16 @@ CATEGORIES= audio MASTER_SITES= http://files.freeswitch.org/ DIST_SUBDIR= freeswitch -MAINTAINER= darcy@NetBSD.org +MAINTAINER= darcy@NetBSD.org COMMENT= FreeSwitch Sounds (French) LICENSE= mpl-1.1 -SOUNDSDIR= share/freeswitch/sounds +SOUNDSDIR= share/freeswitch/sounds USE_TOOLS+= tar INSTALLATION_DIRS+= ${SOUNDSDIR} GENERATE_PLIST+= ${FIND} ${WRKDIR}/fr \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${WRKDIR}/,${SOUNDSDIR}/,g"; -NO_BUILD= yes +NO_BUILD= yes do-install: @${ECHO_MSG} "Installing files..." diff --git a/audio/freeswitch-sounds-fr/options.mk b/audio/freeswitch-sounds-fr/options.mk index 6eb90195877..3dd94cf8a24 100644 --- a/audio/freeswitch-sounds-fr/options.mk +++ b/audio/freeswitch-sounds-fr/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2012/10/21 18:50:54 darcy Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:36 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch -PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k -PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k +PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch +PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k +PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k .include "../../mk/bsd.options.mk" diff --git a/audio/freeswitch-sounds-ru/Makefile b/audio/freeswitch-sounds-ru/Makefile index b0cf8041f86..0ce0de922cf 100644 --- a/audio/freeswitch-sounds-ru/Makefile +++ b/audio/freeswitch-sounds-ru/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.2 2012/10/21 18:54:26 darcy Exp $ +# $NetBSD: Makefile,v 1.3 2015/12/29 04:54:36 dholland Exp $ -DISTNAME= freeswitch-sounds-ru-${VERSION} -VERSION= 1.0.13 -CATEGORIES= audio +DISTNAME= freeswitch-sounds-ru-${VERSION} +VERSION= 1.0.13 +CATEGORIES= audio MASTER_SITES= http://files.freeswitch.org/ DIST_SUBDIR= freeswitch -MAINTAINER= darcy@NetBSD.org +MAINTAINER= darcy@NetBSD.org COMMENT= FreeSwitch Sounds (French) LICENSE= mpl-1.1 -SOUNDSDIR= share/freeswitch/sounds +SOUNDSDIR= share/freeswitch/sounds USE_TOOLS+= tar INSTALLATION_DIRS+= ${SOUNDSDIR} GENERATE_PLIST+= ${FIND} ${WRKDIR}/ru \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${WRKDIR}/,${SOUNDSDIR}/,g"; -NO_BUILD= yes +NO_BUILD= yes do-install: @${ECHO_MSG} "Installing files..." diff --git a/audio/freeswitch-sounds-ru/options.mk b/audio/freeswitch-sounds-ru/options.mk index 1efa6eaac9b..bbe8254f4c0 100644 --- a/audio/freeswitch-sounds-ru/options.mk +++ b/audio/freeswitch-sounds-ru/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2012/10/21 18:50:54 darcy Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:36 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch -PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k -PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k +PKG_OPTIONS_VAR= PKG_OPTIONS.freeswitch +PKG_SUPPORTED_OPTIONS= freeswitch-08k freeswitch-16k freeswitch-32k freeswitch-48k +PKG_SUGGESTED_OPTIONS= freeswitch-08k freeswitch-16k .include "../../mk/bsd.options.mk" diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile index 861b99502fd..5d837d9735c 100644 --- a/audio/jack-rack/Makefile +++ b/audio/jack-rack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/04/25 14:20:21 tnn Exp $ +# $NetBSD: Makefile,v 1.42 2015/12/29 04:54:35 dholland Exp $ # DISTNAME= jack-rack-1.4.7 @@ -24,7 +24,7 @@ BUILD_DEFS+= LADSPA_PLUGIN_PATH EGDIR= ${PREFIX}/share/examples/${PKGBASE} LDFLAGS.DragonFly= -lm LDFLAGS.SunOS+= -lm -CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ +CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ ### ### NOTE: this is a colon-delimited list like e.g. PATH. diff --git a/audio/libfishsound/options.mk b/audio/libfishsound/options.mk index 29f7924fd71..e6efec7ca13 100644 --- a/audio/libfishsound/options.mk +++ b/audio/libfishsound/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/05/25 01:37:59 rodent Exp $ +# $NetBSD: options.mk,v 1.3 2015/12/29 04:54:36 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libfishsound PKG_SUPPORTED_OPTIONS= doc valgrind @@ -19,7 +19,7 @@ PLIST.nodoc= yes .endif .if !empty(PKG_OPTIONS:Mflac) -BUILDLINK_DEPMETHOD.flac= build +BUILDLINK_DEPMETHOD.flac= build .include "../../audio/flac/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-flac diff --git a/audio/libvisual0.2-plugins/Makefile b/audio/libvisual0.2-plugins/Makefile index 9596e812442..fa8420763f5 100644 --- a/audio/libvisual0.2-plugins/Makefile +++ b/audio/libvisual0.2-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2015/04/25 14:20:22 tnn Exp $ +# $NetBSD: Makefile,v 1.28 2015/12/29 04:54:35 dholland Exp $ # DISTNAME= libvisual-plugins-0.2.0 @@ -23,8 +23,8 @@ USE_TOOLS+= pkg-config mkdirhier # sigsegfaults in 0.2.0 because of: # sorry, but the bug with strtof has come, please report.. CONFIGURE_ARGS+= --disable-dancingparticles -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib # install unnecessarily installed files post-install: diff --git a/audio/moc-devel/Makefile b/audio/moc-devel/Makefile index a8ecea2af57..6acbcfaba6e 100644 --- a/audio/moc-devel/Makefile +++ b/audio/moc-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2015/12/09 01:39:10 wiedi Exp $ +# $NetBSD: Makefile,v 1.20 2015/12/29 04:54:35 dholland Exp $ DISTNAME= moc-2.5.0-beta1 PKGREVISION= 3 @@ -36,7 +36,7 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device. post-extract: ${CP} ${FILESDIR}/getline.c ${WRKSRC} -LDFLAGS.SunOS+= -lsocket +LDFLAGS.SunOS+= -lsocket BUILDLINK_TRANSFORM+= l:db:db4 diff --git a/audio/mp3blaster/options.mk b/audio/mp3blaster/options.mk index 2599c83739d..b5e4d269305 100644 --- a/audio/mp3blaster/options.mk +++ b/audio/mp3blaster/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2012/04/14 10:12:01 hans Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:35 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.mp3blaster -PKG_SUPPORTED_OPTIONS= esound oss sdl -PKG_SUGGESTED_OPTIONS= oss +PKG_OPTIONS_VAR= PKG_OPTIONS.mp3blaster +PKG_SUPPORTED_OPTIONS= esound oss sdl +PKG_SUGGESTED_OPTIONS= oss .if ${OPSYS} == "Darwin" PKG_SUGGESTED_OPTIONS= sdl @@ -11,16 +11,16 @@ PKG_SUGGESTED_OPTIONS= sdl .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mesound) -CONFIGURE_ARGS+= --with-esd=yes +CONFIGURE_ARGS+= --with-esd=yes .include "../../audio/esound/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Moss) -CONFIGURE_ARGS+= --with-oss=yes +CONFIGURE_ARGS+= --with-oss=yes .include "../../mk/oss.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Msdl) -CONFIGURE_ARGS+= --with-sdl=yes +CONFIGURE_ARGS+= --with-sdl=yes .include "../../devel/SDL/buildlink3.mk" .endif diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile index c873eb3396d..3e48cc2f35f 100644 --- a/audio/mp3splt-gtk/Makefile +++ b/audio/mp3splt-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2015/04/25 14:20:22 tnn Exp $ +# $NetBSD: Makefile,v 1.32 2015/12/29 04:54:36 dholland Exp $ # DISTNAME= mp3splt-gtk-0.8.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://mp3splt.sourceforge.net/ COMMENT= Utility to split MP3 (VBR supported) and OGG files USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes USE_TOOLS+= pkg-config msgfmt gmake LIBS.SunOS+= -lnsl diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile index 625cb9797a8..a905c9d9ef2 100644 --- a/audio/mp3splt/Makefile +++ b/audio/mp3splt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/07/05 16:15:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2015/12/29 04:54:35 dholland Exp $ # DISTNAME= mp3splt-2.5.2 @@ -11,8 +11,8 @@ COMMENT= Command line utility to split MP3 (VBR supported) and OGG files LICENSE= gnu-gpl-v2 USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -USE_FEATURES= getopt_long +GNU_CONFIGURE= yes +USE_FEATURES= getopt_long USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --disable-nls diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile index 01c35beeed5..c3efa1f5612 100644 --- a/audio/mpegaudio/Makefile +++ b/audio/mpegaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/02 23:48:00 asau Exp $ +# $NetBSD: Makefile,v 1.9 2015/12/29 04:54:35 dholland Exp $ DISTNAME= mpegaudio PKGNAME= mpegaudio-3.9 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= MPEG/audio Layer 1 and Layer 2 encoder/decoder package -INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 post-install: ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/audio/nas-auscope/Makefile b/audio/nas-auscope/Makefile index 2ea2574f5db..92484d6904d 100644 --- a/audio/nas-auscope/Makefile +++ b/audio/nas-auscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/06/12 10:48:23 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2015/12/29 04:54:35 dholland Exp $ DISTNAME= nas-1.9.1.src PKGNAME= nas-auscope-1.9.1 @@ -14,7 +14,7 @@ DEPENDS+= p5-perl-headers-${OS_VERSION}{,nb*}:../../devel/p5-perl-headers WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//}/clients/audio/auscope USE_TOOLS+= perl:run -REPLACE_PERL= auscope +REPLACE_PERL= auscope NO_BUILD= yes diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 8a1d825c576..01b829a8ccf 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:02 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2015/12/29 04:54:36 dholland Exp $ DISTNAME= ncmpc-0.24 PKGREVISION= 2 CATEGORIES= audio #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} MASTER_SITES= http://www.musicpd.org/download/ncmpc/0/ -EXTRACT_SUFX= .tar.xz +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mpd.wikia.com/wiki/Client:Ncmpc diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile index 4068ed9fceb..188db153099 100644 --- a/audio/portaudio-devel/Makefile +++ b/audio/portaudio-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/07/21 10:17:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:36 dholland Exp $ DISTNAME= pa_stable_v19_20140130 PKGNAME= portaudio-devel-20140130 @@ -26,12 +26,12 @@ WRKSRC= ${WRKDIR}/portaudio INSTALLATION_DIRS= include/portaudio2 lib/portaudio2 lib/pkgconfig -SUBST_CLASSES+= pthread -SUBST_STAGE.pthread= pre-configure -SUBST_MESSAGE.pthread= Fixing -lpthread references. -SUBST_FILES.pthread= configure -SUBST_SED.pthread= -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g' -SUBST_SED.pthread+= -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g' +SUBST_CLASSES+= pthread +SUBST_STAGE.pthread= pre-configure +SUBST_MESSAGE.pthread= Fixing -lpthread references. +SUBST_FILES.pthread= configure +SUBST_SED.pthread= -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g' +SUBST_SED.pthread+= -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g' SUBST_CLASSES+= pc SUBST_STAGE.pc= pre-configure diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index b4600dcee38..c77e7f7b483 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2015/12/25 23:09:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.103 2015/12/29 04:54:36 dholland Exp $ DISTNAME= pulseaudio-7.1 PKGREVISION= 2 @@ -35,7 +35,7 @@ USE_PKGLOCALEDIR= yes # Wrong sys/capability.h assumptions, incompatible implementation: .if ${OPSYS} == "FreeBSD" -CONFIGURE_ARGS+= --without-caps +CONFIGURE_ARGS+= --without-caps .endif CONFIGURE_ENV+= EGDIR=${EGDIR} diff --git a/audio/rhythmbox-gtk3/Makefile b/audio/rhythmbox-gtk3/Makefile index 1dcb22269e6..43c0879e19a 100644 --- a/audio/rhythmbox-gtk3/Makefile +++ b/audio/rhythmbox-gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2015/10/10 01:58:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2015/12/29 04:54:36 dholland Exp $ DISTNAME= rhythmbox-3.0.1 PKGREVISION= 7 @@ -37,11 +37,11 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" # needs introspection support -BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.6 -BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.6 +BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.6 +BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.6 .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" -BUILDLINK_API_DEPENDS.totem-pl-parser+= totem-pl-parser>=3.2.0 +BUILDLINK_API_DEPENDS.totem-pl-parser+= totem-pl-parser>=3.2.0 .include "../../multimedia/totem-pl-parser/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile index a21dde20a6a..90d8eeea20e 100644 --- a/audio/xmms-wma/Makefile +++ b/audio/xmms-wma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2015/04/25 14:20:26 tnn Exp $ +# $NetBSD: Makefile,v 1.14 2015/12/29 04:54:36 dholland Exp $ # DISTNAME= xmms-wma-1.0.5 @@ -11,17 +11,17 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mcmcc.bat.ru/xmms-wma/ COMMENT= WMA input plugin for XMMS -ONLY_FOR_PLATFORM= *-*-i386 # Doesn't seem to be very portable... +ONLY_FOR_PLATFORM= *-*-i386 # Doesn't seem to be very portable... USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "Linux" # XXX -SUBST_CLASSES+= rintf -SUBST_STAGE.rintf= pre-configure -SUBST_FILES.rintf= ffmpeg-strip-wma/wmadec.c -SUBST_SED.rintf= -e "s,lrintf,rintf,g" +SUBST_CLASSES+= rintf +SUBST_STAGE.rintf= pre-configure +SUBST_FILES.rintf= ffmpeg-strip-wma/wmadec.c +SUBST_SED.rintf= -e "s,lrintf,rintf,g" .endif .include "../../audio/xmms/buildlink3.mk" diff --git a/biology/plink/Makefile b/biology/plink/Makefile index 0cd1670420b..63ba8f64f84 100644 --- a/biology/plink/Makefile +++ b/biology/plink/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/12/10 14:20:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:37 dholland Exp $ DISTNAME= plink-1.07-src PKGNAME= $(DISTNAME:-src=) @@ -23,7 +23,7 @@ MAKE_FLAGS+= WITH_LAPACK=1 LIB_LAPACK=${LIB_LAPACK:Q} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -MAKE_ENV+= LIB="-lsocket -lnsl" +MAKE_ENV+= LIB="-lsocket -lnsl" .endif INSTALLATION_DIRS= bin diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 2a2f0b5f0db..d374475f923 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2015/10/14 20:17:24 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2015/12/29 04:54:37 dholland Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/FElt-3.05 USE_TOOLS+= gzcat XAW_TYPE?= 3d # does not directly support Xaw3d -BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .PHONY: buildlink-Xaw3d-inc-hack pre-configure: buildlink-Xaw3d-inc-hack diff --git a/chat/hexchat/options.mk b/chat/hexchat/options.mk index 412b05f748e..6d40708b78d 100644 --- a/chat/hexchat/options.mk +++ b/chat/hexchat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/02/18 08:47:12 tnn Exp $ +# $NetBSD: options.mk,v 1.3 2015/12/29 04:54:37 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.hexchat PKG_SUPPORTED_OPTIONS= dbus gtk2 inet6 libcanberra libnotify libpci libproxy @@ -77,7 +77,7 @@ CONFIGURE_ARGS+= --enable-openssl=no USE_TOOLS+= perl PLIST.perl= yes .else -CONFIGURE_ARGS+= --disable-perl +CONFIGURE_ARGS+= --disable-perl .endif .if !empty(PKG_OPTIONS:Mpython) diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index 24c78a40afd..ce781a38d23 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/10/09 14:06:02 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2015/12/29 04:54:37 dholland Exp $ # DISTNAME= jabber-1.4.2 @@ -37,8 +37,8 @@ CPPFLAGS+= -Du_int8_t=uint8_t BUILD_DEFS+= JABBERD_LOGDIR JABBERD_SPOOLDIR \ JABBERD_PIDDIR -PKG_GROUPS= ${JABBERD_GROUP} -PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} +PKG_GROUPS= ${JABBERD_GROUP} +PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} PKG_USERS_VARS+= JABBERD_USER PKG_GROUPS_VARS+= JABBERD_GROUP diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common index 53adca0fc86..c3cb3af23d0 100644 --- a/chat/libpurple/Makefile.common +++ b/chat/libpurple/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2014/12/27 02:21:26 dholland Exp $ +# $NetBSD: Makefile.common,v 1.45 2015/12/29 04:54:37 dholland Exp $ # # used by chat/finch/Makefile # used by chat/libpurple/Makefile @@ -42,8 +42,8 @@ CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --disable-nm CONFIGURE_ARGS+= --disable-vv -CPPFLAGS.SunOS+= -D__EXTENSIONS__ -CFLAGS.SunOS+= -Wno-error=implicit-function-declaration +CPPFLAGS.SunOS+= -D__EXTENSIONS__ +CFLAGS.SunOS+= -Wno-error=implicit-function-declaration PKGCONFIG_OVERRIDE+= finch/finch.pc.in PKGCONFIG_OVERRIDE+= finch/libgnt/gnt.pc.in diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index a3ca4f548ed..87352d03f17 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.64 2013/04/08 11:17:09 rodent Exp $ +# $NetBSD: Makefile.common,v 1.65 2015/12/29 04:54:37 dholland Exp $ # # used by chat/xchat/Makefile # used by chat/xchat-perl/Makefile @@ -22,7 +22,7 @@ USE_TOOLS+= gmake pkg-config .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --disable-mmx +CONFIGURE_ARGS+= --disable-mmx .endif .include "../../devel/glib2/buildlink3.mk" diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile index 2dd8e469e48..571f52425f7 100644 --- a/comms/java-rxtx/Makefile +++ b/comms/java-rxtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/08/13 20:16:22 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2015/12/29 04:54:37 dholland Exp $ # DISTNAME= rxtx-2.1-7r2 @@ -32,7 +32,7 @@ JAVA_MACHINE_ARCH= amd64 .elif !empty(MACHINE_CPU:Marm*) JAVA_MACHINE_ARCH= arm .else -JAVA_MACHINE_ARCH= ${MACHINE_ARCH} +JAVA_MACHINE_ARCH= ${MACHINE_ARCH} .endif .include "../../mk/java-vm.mk" @@ -42,20 +42,20 @@ JAVA_MACHINE_ARCH= ${MACHINE_ARCH} # processing, PKG_JAVA_HOME will match the Pkgsrc JRE home, which is a # suitable installation location for Native JRE, as well as being the # correct installation location for Pkgsrc JRE. -JAVA_INSTALL_BASE:= ${PKG_JAVA_HOME} - -RXTX_PATH= ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH} -JHOME_PATH= ${JAVA_INSTALL_BASE}/jre/lib/ext - -MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} -MAKE_FLAGS+= RXTX_PATH=${RXTX_PATH:Q} -MAKE_FLAGS+= JHOME=${JHOME_PATH:Q} - -INSTALLATION_DIRS+= ${RXTX_PATH:Q} ${JHOME_PATH:Q} - -PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} -PLIST_SUBST+= JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}" - +JAVA_INSTALL_BASE:= ${PKG_JAVA_HOME} + +RXTX_PATH= ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH} +JHOME_PATH= ${JAVA_INSTALL_BASE}/jre/lib/ext + +MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} +MAKE_FLAGS+= RXTX_PATH=${RXTX_PATH:Q} +MAKE_FLAGS+= JHOME=${JHOME_PATH:Q} + +INSTALLATION_DIRS+= ${RXTX_PATH:Q} ${JHOME_PATH:Q} + +PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} +PLIST_SUBST+= JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}" + pre-configure: set -e; cd ${WRKSRC}; \ aclocal; autoheader; automake -a --foreign -i; autoconf diff --git a/databases/jdbc-postgresql92/Makefile b/databases/jdbc-postgresql92/Makefile index 0dfbf39979c..a3ef7d781d2 100644 --- a/databases/jdbc-postgresql92/Makefile +++ b/databases/jdbc-postgresql92/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/11/26 15:50:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/29 04:54:37 dholland Exp $ # DISTNAME= postgresql-jdbc-9.2-${PGBUILD}.src @@ -14,13 +14,13 @@ COMMENT= PostgreSQL 9.2 JDBC4 driver PGBUILD= 1002 JARDIST= postgresql-9.2-${PGBUILD}.jdbc4.jar JARFILE= postgresql92.jar -EXTRACT_ONLY= ${DISTFILES:N*.jar} +EXTRACT_ONLY= ${DISTFILES:N*.jar} INSTALLATION_DIRS= lib/java ${DOCDIR} USE_JAVA= run USE_JAVA2= 6 -NO_BUILD= YES +NO_BUILD= YES DOCDIR= share/doc/java/${PKGBASE} PLIST_SUBST+= JARFILE=${JARFILE:Q} diff --git a/databases/jdbc-postgresql93/Makefile b/databases/jdbc-postgresql93/Makefile index f135060ac4c..85a713340f6 100644 --- a/databases/jdbc-postgresql93/Makefile +++ b/databases/jdbc-postgresql93/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2015/07/19 11:01:41 asau Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/29 04:54:37 dholland Exp $ DISTNAME= postgresql-jdbc-9.3-${PGBUILD}.src PKGNAME= jdbc-postgresql93-${PGBUILD} @@ -13,15 +13,15 @@ COMMENT= PostgreSQL 9.3 JDBC4 driver PGBUILD= 1103 JARDIST= postgresql-9.3-${PGBUILD}.jdbc4.jar JARFILE= postgresql93.jar -EXTRACT_ONLY= ${DISTFILES:N*.jar} +EXTRACT_ONLY= ${DISTFILES:N*.jar} INSTALLATION_DIRS= lib/java ${DOCDIR} USE_JAVA= run USE_JAVA2= 6 -NO_BUILD= YES +NO_BUILD= YES -DOCDIR= share/doc/java/${PKGBASE} +DOCDIR= share/doc/java/${PKGBASE} PLIST_SUBST+= JARFILE=${JARFILE:Q} PLIST_SUBST+= DOCDIR=${DOCDIR:Q} diff --git a/databases/jdbc-postgresql94/Makefile b/databases/jdbc-postgresql94/Makefile index bf0f8afabb4..4191041b86f 100644 --- a/databases/jdbc-postgresql94/Makefile +++ b/databases/jdbc-postgresql94/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2015/07/19 13:14:58 asau Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/29 04:54:37 dholland Exp $ DISTNAME= postgresql-jdbc-9.4-${PGBUILD}.src PKGNAME= jdbc-postgresql94-${PGBUILD} @@ -13,13 +13,13 @@ COMMENT= PostgreSQL 9.4 JDBC4 driver PGBUILD= 1201 JARDIST= postgresql-9.4-${PGBUILD}.jdbc4.jar JARFILE= postgresql94.jar -EXTRACT_ONLY= ${DISTFILES:N*.jar} +EXTRACT_ONLY= ${DISTFILES:N*.jar} INSTALLATION_DIRS= lib/java ${DOCDIR} USE_JAVA= run USE_JAVA2= 6 -NO_BUILD= YES +NO_BUILD= YES DOCDIR= share/doc/java/${PKGBASE} PLIST_SUBST+= JARFILE=${JARFILE:Q} diff --git a/devel/ruby-redmine_jenkins/Makefile b/devel/ruby-redmine_jenkins/Makefile index 8629e33ed28..3168e7f6dc6 100644 --- a/devel/ruby-redmine_jenkins/Makefile +++ b/devel/ruby-redmine_jenkins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/07/06 04:12:49 rodent Exp $ +# $NetBSD: Makefile,v 1.2 2015/12/29 04:54:38 dholland Exp $ GITHUB_PROJECT= redmine_jenkins DISTNAME= 1.0.1 @@ -74,13 +74,13 @@ do-build: ${FAIL_MSG} "Build of ${_gem_}.gem failed." .endfor -RUBYGEM_INSTALL_ROOT= ${WRKDIR}/.inst -RUBYGEM_INSTALL_ROOT_OPTION= --install-root ${RUBYGEM_INSTALL_ROOT} -_RUBYGEM_OPTIONS= --no-update-sources # don't cache the gem index -_RUBYGEM_OPTIONS+= --install-dir ${PREFIX}/${GEM_HOME} -_RUBYGEM_OPTIONS+= ${RUBYGEM_INSTALL_ROOT_OPTION} -_RUBYGEM_OPTIONS+= --ignore-dependencies -_RUBYGEM_OPTIONS+= --no-ri --no-rdoc +RUBYGEM_INSTALL_ROOT= ${WRKDIR}/.inst +RUBYGEM_INSTALL_ROOT_OPTION= --install-root ${RUBYGEM_INSTALL_ROOT} +_RUBYGEM_OPTIONS= --no-update-sources # don't cache the gem index +_RUBYGEM_OPTIONS+= --install-dir ${PREFIX}/${GEM_HOME} +_RUBYGEM_OPTIONS+= ${RUBYGEM_INSTALL_ROOT_OPTION} +_RUBYGEM_OPTIONS+= --ignore-dependencies +_RUBYGEM_OPTIONS+= --no-ri --no-rdoc .include "../../lang/ruby/rubyversion.mk" diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index c827a37ca9d..adf49fcc2a3 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/11 14:42:03 adam Exp $ +# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= tclreadline-2.1.0 @@ -19,13 +19,13 @@ EGDIR= ${PREFIX}/share/examples/tclreadline MESSAGE_SUBST+= EGDIR=${EGDIR} -SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKSRC}/pkgIndex.tcl.in -SUBST_FILES.paths+= ${WRKSRC}/tclreadlineInit.tcl.in -SUBST_FILES.paths+= ${WRKSRC}/tclreadlineSetup.tcl.in -SUBST_STAGE.paths= post-patch -SUBST_SED.paths= -e 's,\/usr\/local,${PREFIX},' -SUBST_SED.paths+= -e 's,\/usr\/locanl,${PREFIX},' +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKSRC}/pkgIndex.tcl.in +SUBST_FILES.paths+= ${WRKSRC}/tclreadlineInit.tcl.in +SUBST_FILES.paths+= ${WRKSRC}/tclreadlineSetup.tcl.in +SUBST_STAGE.paths= post-patch +SUBST_SED.paths= -e 's,\/usr\/local,${PREFIX},' +SUBST_SED.paths+= -e 's,\/usr\/locanl,${PREFIX},' INSTALLATION_DIRS= include ${PKGMANDIR}/mann lib \ lib/tclreadline${PKGVERSION} ${EGDIR} diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile index 45c6f277d73..5812a4d469a 100644 --- a/devel/umbrello/Makefile +++ b/devel/umbrello/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.31 2015/12/05 21:25:41 adam Exp $ +# $NetBSD: Makefile,v 1.32 2015/12/29 04:54:38 dholland Exp $ DISTNAME= umbrello-${_KDE_VERSION} PKGREVISION= 2 CATEGORIES= devel COMMENT= UML Modeller -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 4.11.3 +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 4.11.3 .include "../../meta-pkgs/kde4/Makefile.kde4" diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile index b4c29060eb2..cf679265dfa 100644 --- a/editors/tomboy/Makefile +++ b/editors/tomboy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2015/10/10 01:58:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.68 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= tomboy-1.2.1 @@ -11,9 +11,9 @@ HOMEPAGE= http://www.gnome.org/projects/tomboy COMMENT= Gnome desktop note application LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt GCONF_SCHEMAS= tomboy.schemas diff --git a/www/yaws/Makefile b/www/yaws/Makefile index 8092828fb8e..ec75e09f382 100644 --- a/www/yaws/Makefile +++ b/www/yaws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/08/13 10:59:39 is Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= yaws-1.97 @@ -43,12 +43,12 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 INSTALLATION_DIRS+= ${PKGMANDIR}/man5 # remove after upgrading to a now()-less yaws: -SUBST_CLASSES+= now -SUBST_STAGE.now= post-patch -SUBST_FILES.now= */*.erl -SUBST_SED.now= -e 's|\([^:a-zA-Z]\)now()|\1erlang:timestamp()|g' -SUBST_SED.now+= -e 's|\([^:a-zA-Z]\)erlang:now()|\1erlang:timestamp()|g' -SUBST_MESSAGE.now= Replacing now(). +SUBST_CLASSES+= now +SUBST_STAGE.now= post-patch +SUBST_FILES.now= */*.erl +SUBST_SED.now= -e 's|\([^:a-zA-Z]\)now()|\1erlang:timestamp()|g' +SUBST_SED.now+= -e 's|\([^:a-zA-Z]\)erlang:now()|\1erlang:timestamp()|g' +SUBST_MESSAGE.now= Replacing now(). post-patch: ${RM} ${WRKDIR}/yaws diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index d29c7c74341..8a6e703293e 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2015/12/29 04:54:38 dholland Exp $ BUILDLINK_TREE+= Xaw-Xpm @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1 BUILDLINK_ABI_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1nb2 BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm -BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/appmenu-qt/Makefile b/x11/appmenu-qt/Makefile index 48bad298717..65ef735882d 100644 --- a/x11/appmenu-qt/Makefile +++ b/x11/appmenu-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/04/25 14:25:02 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2015/12/29 04:54:39 dholland Exp $ DISTNAME= appmenu-qt-0.2.6 PKGREVISION= 2 @@ -12,8 +12,8 @@ COMMENT= Allows Qt applications to export menus over DBus to a menu applet LICENSE= gnu-lgpl-v2.1 USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ -USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_CMAKE= yes pre-configure: ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ diff --git a/x11/autocutsel/Makefile b/x11/autocutsel/Makefile index c43f47d51ae..ff0738a47b9 100644 --- a/x11/autocutsel/Makefile +++ b/x11/autocutsel/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2015/06/09 13:10:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= autocutsel-0.10.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=sigmike/} GITHUB_PROJECT= autocutsel -GITHUB_TAG= ${PKGVERSION_NOREV} +GITHUB_TAG= ${PKGVERSION_NOREV} MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.nongnu.org/autocutsel/ diff --git a/x11/eekboard/Makefile b/x11/eekboard/Makefile index edab6a7b531..e05de1e3c50 100644 --- a/x11/eekboard/Makefile +++ b/x11/eekboard/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.34 2015/05/06 08:54:49 mef Exp $ +# $NetBSD: Makefile,v 1.35 2015/12/29 04:54:38 dholland Exp $ DISTNAME= eekboard-1.0.8 PKGREVISION= 5 -MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/} GITHUB_PROJECT= eekboard -GITHUB_TAG= ${DISTNAME} +GITHUB_TAG= ${DISTNAME} CATEGORIES= x11 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/x11/elementary/Makefile b/x11/elementary/Makefile index b0ca05156d9..97fe61adf51 100644 --- a/x11/elementary/Makefile +++ b/x11/elementary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/05/03 13:14:39 alnsn Exp $ +# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $ DISTNAME= elementary-1.7.7 PKGREVISION= 4 @@ -28,7 +28,7 @@ PKGCONFIG_OVERRIDE= elementary # currently it is like it is MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-1.7.7 PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} -PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } +PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } MAKE_FLAGS+= MODULE_ARCH=${MODULE_ARCH} diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index c5c28355e79..909528882b7 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/05/03 13:14:39 alnsn Exp $ +# $NetBSD: Makefile,v 1.36 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= enlightenment-0.17.3 @@ -56,7 +56,7 @@ PKGCONFIG_OVERRIDE= enlightenment.pc.in MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-${PKGVERSION_NOREV} PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} -PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } +PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } .include "../../devel/ecore/buildlink3.mk" .include "../../devel/eet/buildlink3.mk" diff --git a/x11/gtkada/Makefile b/x11/gtkada/Makefile index f717a4db938..3d840f98b1d 100644 --- a/x11/gtkada/Makefile +++ b/x11/gtkada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/09/24 02:38:33 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= gtkada-${GTKADA_VERSION} @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-nls \ --with-GL=no MAKE_ENV+= PROCESSORS=${MAKE_JOBS} -SUBST_CLASSES+= docs lgnat sphinx +SUBST_CLASSES+= docs lgnat sphinx SUBST_STAGE.docs= post-patch SUBST_FILES.docs= Makefile.in SUBST_SED.docs= -e 's/^all: \(.*\)/all: \1 docs/g' diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile index de7e56850dd..10105114420 100644 --- a/x11/labltk/Makefile +++ b/x11/labltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/08/07 11:20:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2015/12/29 04:54:39 dholland Exp $ DISTNAME= labltk-8.06.0 PKGREVISION= 3 @@ -8,7 +8,7 @@ LICENSE= gnu-lgpl-v2.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://forge.ocamlcore.org/projects/labltk/ -COMMENT= Tk bindings for ocaml +COMMENT= Tk bindings for ocaml USE_TOOLS+= gmake MAKE_JOBS_SAFE= no diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index a4b50089622..4a0530233b2 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/05/01 08:43:00 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2015/12/29 04:54:39 dholland Exp $ DISTNAME= libXrender-0.9.9 CATEGORIES= x11 devel @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" .include "../../x11/renderproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 +BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libxkbcommon/options.mk b/x11/libxkbcommon/options.mk index ac5d01e6998..aa8d683a433 100644 --- a/x11/libxkbcommon/options.mk +++ b/x11/libxkbcommon/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/12/18 18:51:03 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libxkbcommon PKG_SUPPORTED_OPTIONS= doc @@ -8,9 +8,9 @@ PLIST_VARS+= doc .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdoc) -BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen +BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen PLIST.doc= yes -CONFIGURE_ARGS+= --enable-docs=yes +CONFIGURE_ARGS+= --enable-docs=yes .else -CONFIGURE_ARGS+= --enable-docs=no +CONFIGURE_ARGS+= --enable-docs=no .endif diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index 294c1b50351..d7d7d915974 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/10/25 20:05:01 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:40 dholland Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} @@ -18,12 +18,12 @@ USE_LANGUAGES= c c++ objc ONLY_FOR_PLATFORM= Darwin-*-* -BUILD_DEFS+= VARBASE -BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR +BUILD_DEFS+= VARBASE +BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR -OWN_DIRS+= ${VARBASE}/log -OWN_DIRS+= ${XKB_OUTPUT_DIR} -XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config +OWN_DIRS+= ${VARBASE}/log +OWN_DIRS+= ${XKB_OUTPUT_DIR} +XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config @@ -36,49 +36,49 @@ DEPENDS+= xinit-[0-9]*:../../x11/xinit LEGACY_FONT_PATHS= DEFAULT_FONT_PATHS= .for f in misc TTF OTF Type1 100dpi 75dpi cyrillic -DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} -LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} +DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} +LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} .endfor -FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} +FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} CONFIGURE_ARGS+= --enable-xquartz -CONFIGURE_ARGS+= --disable-xorg -CONFIGURE_ARGS+= --disable-xephyr -CONFIGURE_ARGS+= --disable-kdrive -CONFIGURE_ARGS+= --disable-config-hal -CONFIGURE_ARGS+= --disable-dmx -CONFIGURE_ARGS+= --disable-xwin -CONFIGURE_ARGS+= --disable-xfake -CONFIGURE_ARGS+= --disable-xfbdev - -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} -CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 -CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} - -CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" -CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" -CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} - -CONFIGURE_ARGS+= --enable-xtrans-send-fds -CONFIGURE_ARGS+= --enable-dri -CONFIGURE_ARGS+= --enable-dri2 -CONFIGURE_ARGS+= --enable-dri3 -CONFIGURE_ARGS+= --enable-glx -CONFIGURE_ARGS+= --enable-aiglx -CONFIGURE_ARGS+= --enable-glamor -CONFIGURE_ARGS+= --enable-ipv6 +CONFIGURE_ARGS+= --disable-xorg +CONFIGURE_ARGS+= --disable-xephyr +CONFIGURE_ARGS+= --disable-kdrive +CONFIGURE_ARGS+= --disable-config-hal +CONFIGURE_ARGS+= --disable-dmx +CONFIGURE_ARGS+= --disable-xwin +CONFIGURE_ARGS+= --disable-xfake +CONFIGURE_ARGS+= --disable-xfbdev + +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} +CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 +CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} + +CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" +CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" +CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} + +CONFIGURE_ARGS+= --enable-xtrans-send-fds +CONFIGURE_ARGS+= --enable-dri +CONFIGURE_ARGS+= --enable-dri2 +CONFIGURE_ARGS+= --enable-dri3 +CONFIGURE_ARGS+= --enable-glx +CONFIGURE_ARGS+= --enable-aiglx +CONFIGURE_ARGS+= --enable-glamor +CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --with-apple-applications-dir=${PREFIX}/Applications/Utilities -CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 +CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 +CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" .include "../../security/nettle/buildlink3.mk" -CONFIGURE_ARGS+= --with-sha1=libnettle +CONFIGURE_ARGS+= --with-sha1=libnettle .if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers) MY_OSX_VERS!= /usr/bin/sw_vers -productVersion diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index dacebc49388..658b91245ea 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2015/12/29 04:54:39 dholland Exp $ BUILDLINK_TREE+= neXtaw @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw -BUILDLINK_TRANSFORM+= l:Xaw:neXtaw +BUILDLINK_TRANSFORM+= l:Xaw:neXtaw .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index c6bb411e0c3..66fa98a559b 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/08/07 11:20:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2015/12/29 04:54:39 dholland Exp $ .include "../../lang/ocaml/Makefile.common" DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo @@ -54,12 +54,12 @@ SUBST_FILES.mklib= otherlibs/Makefile.shared SUBST_SED.mklib= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g' SUBST_MESSAGE.mklib= Fixing MKLIB in otherlibs/Makefile.shared. -SUBST_CLASSES+= comp -SUBST_STAGE.comp= post-patch -SUBST_FILES.comp= otherlibs/Makefile -SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' -SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' -SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. +SUBST_CLASSES+= comp +SUBST_STAGE.comp= post-patch +SUBST_FILES.comp= otherlibs/Makefile +SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' +SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' +SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. INSTALLATION_DIRS+= lib/ocaml/stublibs diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile index 4f3141dde9a..854d9494c35 100644 --- a/x11/ocaml-lablgtk/Makefile +++ b/x11/ocaml-lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $ DISTNAME= lablgtk-2.18.3 PKGREVISION= 6 @@ -41,7 +41,7 @@ PLIST.stubs= yes .include "../../mk/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" -PLIST.opt= yes +PLIST.opt= yes .endif .include "options.mk" diff --git a/x11/py-qwt-qt4/Makefile b/x11/py-qwt-qt4/Makefile index 6f8ef714f7d..0439e088847 100644 --- a/x11/py-qwt-qt4/Makefile +++ b/x11/py-qwt-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/12/05 21:26:09 adam Exp $ +# $NetBSD: Makefile,v 1.5 2015/12/29 04:54:40 dholland Exp $ DISTNAME= PyQwt-5.2.0 PKGNAME= ${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//} @@ -21,7 +21,7 @@ PLIST_SUBST+= PYSITELIB=${PYSITELIB} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} # Following line rescues from 'Unresolved dependency with pbulk' -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-Numeric +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-Numeric REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/grace.py REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/qplt.py diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 843cc71d241..61884303204 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/01/20 19:20:09 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ # DISTNAME= Tix${TIX_VERSION}-src @@ -23,14 +23,14 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib CONFIGURE_ARGS+= --disable-stubs -CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} +CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} MAKE_ENV+= TCL_DIR=${BUILDLINK_PREFIX.tcl} MAKE_ENV+= TK_DIR=${BUILDLINK_PREFIX.tk} MAKE_ENV+= LIBS=${X11_LDFLAGS:Q} INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} TEST_TARGET= test -INSTALLATION_DIRS+= ${PKGMANDIR}/mann +INSTALLATION_DIRS+= ${PKGMANDIR}/mann INSTALLATION_DIRS+= lib/Tix${TIX_VERSION}/docs USE_TOOLS+= tar diff --git a/x11/tk-Tix/options.mk b/x11/tk-Tix/options.mk index f6d1e1a97b0..7fd9446c575 100644 --- a/x11/tk-Tix/options.mk +++ b/x11/tk-Tix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2012/08/28 11:46:32 he Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.Tix PKG_SUPPORTED_OPTIONS= threads debug @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= threads .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-symbols +CONFIGURE_ARGS+= --enable-symbols .endif .if !empty(PKG_OPTIONS:Mthreads) diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 55fca3981fa..b62762f4eba 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.9 2015/04/25 14:25:20 tnn Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $ VERSION= 3.0.2 PKGREVISION= 2 DISTNAME= wxWidgets-${VERSION} PKGNAME= wxGTK30-${VERSION} CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= dbj@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ COMMENT= GTK-based implementation of the wxWidgets GUI library # LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows -LICENSE= gnu-lgpl-v2 +LICENSE= gnu-lgpl-v2 PATCHFILES= ${DISTNAME}-libtool.diff.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11/xcb-util/builtin.mk b/x11/xcb-util/builtin.mk index 01c1350fce0..47a2259832c 100644 --- a/x11/xcb-util/builtin.mk +++ b/x11/xcb-util/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2014/10/20 11:10:31 wiz Exp $ +# $NetBSD: builtin.mk,v 1.5 2015/12/29 04:54:39 dholland Exp $ BUILTIN_PKG:= xcb-util PKGCONFIG_FILE.xcb-util= ${X11BASE}/lib/pkgconfig/xcb-atom.pc @@ -8,8 +8,8 @@ PKGCONFIG_FILE.xcb-util+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-atom.pc .include "../../mk/x11.builtin.mk" .if !empty(USE_BUILTIN.xcb-util:M[yY][eE][sS]) -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-atom.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-aux.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-event.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-util.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-atom.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-aux.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-event.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-util.pc .endif diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 3148fd9095a..5bb89edbe75 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/10/14 20:17:28 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ DISTNAME= xcolorsel-1.1a-src PKGNAME= xcolorsel-1.1a @@ -12,16 +12,16 @@ COMMENT= Browse and select named X colors from rgb.txt WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes -SUBST_CLASSES+= xcolorsel -SUBST_STAGE.xcolorsel= pre-configure -SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. -SUBST_FILES.xcolorsel= RgbText.c -SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" +SUBST_CLASSES+= xcolorsel +SUBST_STAGE.xcolorsel= pre-configure +SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. +SUBST_FILES.xcolorsel= RgbText.c +SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" #this requires Xaw3d XAW_TYPE= 3d # does not directly support Xaw3d -BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .PHONY: buildlink-Xaw3d-inc-hack pre-configure: buildlink-Xaw3d-inc-hack diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index 10304752bed..cd4f9be0a2d 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/10/22 14:33:03 mef Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/29 04:54:39 dholland Exp $ DISTNAME= xwininfo-1.1.3 CATEGORIES= x11 @@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libXext/buildlink3.mk" -BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9 +BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9 .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |