aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
commitaad09bc5e23eb75a7a865a8b0002fbc6e13d4659 (patch)
tree69c07cdc4812f0f8be0cc44c38513f540c058778
parent5c818b158c5b9479669f8322b4da8c48f5c30ef9 (diff)
downloadports-aad09bc5e23eb75a7a865a8b0002fbc6e13d4659.tar.gz
ports-aad09bc5e23eb75a7a865a8b0002fbc6e13d4659.zip
When linking a library libA with a library libB using libtool, if libB.la
exists, libtool will add all libraries libB.la refers to (dependency_libs field) to the linker command line and store them in the dependency_libs field of libA.la. So everything that subsequently links with libA will also link to these extra libraries. This causes too much overlinking. This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs field in .la libraries during staging. However, because .la libraries have very limited use when dependency_libs is empty it makes sense to completely remove them during staging. So with this commit USES=libtool is modified to remove .la libraries and a new form (USES=libtool:keepla) is introduced in case they need to be kept (dependency_libs is still emptied). PORTREVISION is bumped on all ports with USES=libtool that install .la libraries. Most ports are also changed to add :keepla because .la libraries have to be kept around as long as there are dependent ports with .la libraries that refer to them in their dependency_libs field. In most cases :keepla can be removed again as soon as all dependent ports that install .la libraries have some form of USES=libtool added to their Makefile. PR: ports/188759 Exp-run: bdrewery Approved by: portmgr (bdrewery)
Notes
Notes: svn path=/head/; revision=351936
-rw-r--r--CHANGES12
-rw-r--r--Mk/Uses/libtool.mk17
-rw-r--r--Mk/bsd.port.mk26
-rw-r--r--Mk/bsd.xorg.mk2
-rw-r--r--archivers/libcomprex/Makefile4
-rw-r--r--archivers/libdynamite/Makefile4
-rw-r--r--archivers/liborange/Makefile3
-rw-r--r--archivers/librtfcomp/Makefile4
-rw-r--r--archivers/lzo2/Makefile4
-rw-r--r--archivers/ucl/Makefile4
-rw-r--r--archivers/unshield/Makefile4
-rw-r--r--audio/gstreamer1-plugins-a52dec/Makefile2
-rw-r--r--audio/gstreamer1-plugins-amrnb/Makefile2
-rw-r--r--audio/gstreamer1-plugins-amrwbdec/Makefile2
-rw-r--r--audio/gstreamer1-plugins-cdparanoia/Makefile2
-rw-r--r--audio/gstreamer1-plugins-faac/Makefile2
-rw-r--r--audio/gstreamer1-plugins-faad/Makefile2
-rw-r--r--audio/gstreamer1-plugins-flac/Makefile2
-rw-r--r--audio/gstreamer1-plugins-flite/Makefile2
-rw-r--r--audio/gstreamer1-plugins-gme/Makefile2
-rw-r--r--audio/gstreamer1-plugins-gsm/Makefile2
-rw-r--r--audio/gstreamer1-plugins-jack/Makefile2
-rw-r--r--audio/gstreamer1-plugins-lame/Makefile2
-rw-r--r--audio/gstreamer1-plugins-mad/Makefile2
-rw-r--r--audio/gstreamer1-plugins-modplug/Makefile2
-rw-r--r--audio/gstreamer1-plugins-ogg/Makefile2
-rw-r--r--audio/gstreamer1-plugins-opus/Makefile2
-rw-r--r--audio/gstreamer1-plugins-shout2/Makefile2
-rw-r--r--audio/gstreamer1-plugins-sidplay/Makefile2
-rw-r--r--audio/gstreamer1-plugins-soundtouch/Makefile2
-rw-r--r--audio/gstreamer1-plugins-speex/Makefile2
-rw-r--r--audio/gstreamer1-plugins-taglib/Makefile2
-rw-r--r--audio/gstreamer1-plugins-twolame/Makefile2
-rw-r--r--audio/gstreamer1-plugins-vorbis/Makefile2
-rw-r--r--audio/gstreamer1-plugins-wavpack/Makefile2
-rw-r--r--audio/id3lib/Makefile4
-rw-r--r--audio/libcddb/Makefile2
-rw-r--r--audio/libmad/Makefile2
-rw-r--r--audio/libmikmod/Makefile3
-rw-r--r--audio/libsamplerate/Makefile4
-rw-r--r--audio/libtremor/Makefile3
-rw-r--r--audio/mpg123/Makefile3
-rw-r--r--audio/pd/Makefile3
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--audio/speex/Makefile4
-rw-r--r--benchmarks/iperf3/Makefile3
-rw-r--r--comms/aldo/Makefile4
-rw-r--r--comms/gsmlib/Makefile4
-rw-r--r--comms/gstreamer1-plugins-spandsp/Makefile2
-rw-r--r--comms/hidapi/Makefile2
-rw-r--r--comms/hidapi/pkg-plist1
-rw-r--r--converters/recode/Makefile4
-rw-r--r--databases/glom/Makefile6
-rw-r--r--databases/libgdamm/Makefile4
-rw-r--r--databases/libiodbc/Makefile1
-rw-r--r--databases/libzdb/Makefile4
-rw-r--r--databases/vsqlite/Makefile4
-rw-r--r--deskutils/bitcollider/Makefile4
-rw-r--r--deskutils/gtkjournal/Makefile4
-rw-r--r--deskutils/notify-osd/Makefile7
-rw-r--r--devel/anjuta-extras/Makefile4
-rw-r--r--devel/anjuta/Makefile6
-rw-r--r--devel/bug-buddy/Makefile4
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/eggdbus/Makefile4
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/glade3/Makefile4
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/gnome-vfs-monikers/Makefile4
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfsmm/Makefile4
-rw-r--r--devel/goffice010/Makefile3
-rw-r--r--devel/gstreamer1-plugins-soup/Makefile2
-rw-r--r--devel/judy/Makefile3
-rw-r--r--devel/libIDL/Makefile4
-rw-r--r--devel/libdaemon/Makefile3
-rw-r--r--devel/libdnsres/Makefile4
-rw-r--r--devel/libevt/Makefile3
-rw-r--r--devel/libevtx/Makefile3
-rw-r--r--devel/libewf/Makefile3
-rw-r--r--devel/libgdata/Makefile4
-rw-r--r--devel/libgee/Makefile3
-rw-r--r--devel/libghthash/Makefile4
-rw-r--r--devel/libglademm24/Makefile4
-rw-r--r--devel/liblnk/Makefile3
-rw-r--r--devel/liblogging/Makefile3
-rw-r--r--devel/libmimedir/Makefile3
-rw-r--r--devel/libmsiecf/Makefile3
-rw-r--r--devel/liboil/Makefile3
-rw-r--r--devel/libolecf/Makefile3
-rw-r--r--devel/liboobs/Makefile4
-rw-r--r--devel/libpciaccess/Makefile2
-rw-r--r--devel/libpeas/Makefile3
-rw-r--r--devel/libregf/Makefile3
-rw-r--r--devel/libsigcx/Makefile4
-rw-r--r--devel/libsoup/Makefile4
-rw-r--r--devel/libvshadow/Makefile5
-rw-r--r--devel/log4cplus/Makefile3
-rw-r--r--devel/mq4cpp/Makefile4
-rw-r--r--devel/orc/Makefile4
-rw-r--r--devel/protobuf-c/Makefile4
-rw-r--r--devel/pthsem/Makefile3
-rw-r--r--devel/py-notify/Makefile4
-rw-r--r--devel/rudiments/Makefile3
-rw-r--r--devel/sdl_console/Makefile4
-rw-r--r--devel/seed/Makefile4
-rw-r--r--devel/seed3/Makefile4
-rw-r--r--devel/stringencoders/Makefile4
-rw-r--r--devel/sysfsutils/Makefile4
-rw-r--r--devel/udis86/Makefile4
-rw-r--r--devel/umem/Makefile4
-rw-r--r--devel/varconf/Makefile4
-rw-r--r--editors/gedit-plugins/Makefile4
-rw-r--r--editors/gedit/Makefile5
-rw-r--r--editors/ghex/Makefile4
-rw-r--r--editors/nvi-devel/Makefile4
-rw-r--r--french/med/Makefile3
-rw-r--r--ftp/gstreamer1-plugins-curl/Makefile2
-rw-r--r--games/ggz-client-libs/Makefile2
-rw-r--r--games/ggz-gtk-client/Makefile2
-rw-r--r--games/libggz/Makefile2
-rw-r--r--games/pinball/Makefile4
-rw-r--r--graphics/OpenEXR/Makefile4
-rw-r--r--graphics/aalib/Makefile4
-rw-r--r--graphics/cairo/Makefile4
-rw-r--r--graphics/cairomm/Makefile4
-rw-r--r--graphics/clutter-box2d/Makefile4
-rw-r--r--graphics/clutter-gtk/Makefile4
-rw-r--r--graphics/clutter/Makefile4
-rw-r--r--graphics/dia/Makefile5
-rw-r--r--graphics/eog-plugins/Makefile4
-rw-r--r--graphics/eog/Makefile5
-rw-r--r--graphics/evince/Makefile5
-rw-r--r--graphics/exiv2/Makefile3
-rw-r--r--graphics/freeglut/Makefile4
-rw-r--r--graphics/gegl/Makefile4
-rw-r--r--graphics/glitz/Makefile4
-rw-r--r--graphics/goocanvas/Makefile4
-rw-r--r--graphics/goocanvasmm/Makefile4
-rw-r--r--graphics/goocanvasmm2/Makefile4
-rw-r--r--graphics/gstreamer1-plugins-aalib/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-cairo/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-gdkpixbuf/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-jpeg/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-libcaca/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-libvisual/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-opencv/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-openjpeg/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-png/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-webp/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-zbar/Makefile2
-rw-r--r--graphics/lcms/Makefile4
-rw-r--r--graphics/lcms2/Makefile3
-rw-r--r--graphics/libcaca/Makefile4
-rw-r--r--graphics/libchamplain/Makefile4
-rw-r--r--graphics/libetonyek/Makefile6
-rw-r--r--graphics/libexif/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile6
-rw-r--r--graphics/libgnomecanvasmm26/Makefile4
-rw-r--r--graphics/libopenraw/Makefile4
-rw-r--r--graphics/libwpg/Makefile4
-rw-r--r--graphics/poppler-glib/Makefile2
-rw-r--r--graphics/poppler-qt4/Makefile2
-rw-r--r--graphics/poppler-utils/Makefile2
-rw-r--r--graphics/poppler/Makefile4
-rw-r--r--japanese/FreeWnn-lib/Makefile2
-rw-r--r--japanese/FreeWnn-lib/Makefile.common2
-rw-r--r--japanese/FreeWnn-server/Makefile2
-rw-r--r--japanese/kakasi/Makefile1
-rw-r--r--lang/gjs/Makefile4
-rw-r--r--lang/vala/Makefile3
-rw-r--r--mail/evolution-exchange/Makefile4
-rw-r--r--mail/evolution/Makefile6
-rw-r--r--math/fftw/Makefile4
-rw-r--r--math/fityk/Makefile4
-rw-r--r--math/giacxcas/Makefile12
-rw-r--r--math/gmp/Makefile4
-rw-r--r--math/matio/Makefile3
-rw-r--r--math/mpfr/Makefile5
-rw-r--r--misc/libisocodes/Makefile7
-rw-r--r--misc/xdelta/Makefile4
-rw-r--r--multimedia/cheese/Makefile6
-rw-r--r--multimedia/gstreamer1-plugins-assrender/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-bad/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-dts/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-dv/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-dvdread/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-good/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-kate/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-mpeg2dec/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-mpeg2enc/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-resindvd/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-rtmp/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-schroedinger/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-theora/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-ugly/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-v4l2/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-vpx/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-x264/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins/Makefile4
-rw-r--r--multimedia/gstreamer1/Makefile4
-rw-r--r--multimedia/gxine/Makefile7
-rw-r--r--multimedia/libmpeg2/Makefile4
-rw-r--r--multimedia/libtheora/Makefile4
-rw-r--r--multimedia/totem-pl-parser/Makefile4
-rw-r--r--multimedia/totem/Makefile9
-rw-r--r--net-im/folks04/Makefile8
-rw-r--r--net-im/gloox/Makefile3
-rw-r--r--net-mgmt/cflowd/Makefile4
-rw-r--r--net/glib-networking/Makefile3
-rw-r--r--net/gstreamer1-plugins-libmms/Makefile2
-rw-r--r--net/libmms/Makefile3
-rw-r--r--net/libsocket++/Makefile4
-rw-r--r--net/mpich/Makefile2
-rw-r--r--net/mpich/pkg-plist6
-rw-r--r--net/xmlrpc-epi/Makefile4
-rw-r--r--ports-mgmt/pkg-devel/Makefile3
-rw-r--r--print/freetype2/Makefile5
-rw-r--r--science/gchemutils/Makefile6
-rw-r--r--science/hdf5-18/Makefile4
-rw-r--r--science/netcdf/Makefile4
-rw-r--r--security/ipsec-tools/Makefile4
-rw-r--r--security/libgcrypt/Makefile2
-rw-r--r--security/libident/Makefile4
-rw-r--r--security/libpwquality/Makefile3
-rw-r--r--security/libsecret/Makefile3
-rw-r--r--security/opencdk/Makefile6
-rw-r--r--security/p11-kit/Makefile3
-rw-r--r--security/pam-mysql/Makefile4
-rw-r--r--security/pkcs11-helper/Makefile6
-rw-r--r--sysutils/fusefs-encfs/Makefile4
-rw-r--r--sysutils/gstreamer1-plugins-cdio/Makefile2
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/policykit/Makefile4
-rw-r--r--sysutils/polkit/Makefile4
-rw-r--r--sysutils/sleuthkit/Makefile3
-rw-r--r--textproc/gtkspell3/Makefile3
-rw-r--r--textproc/libmwaw/Makefile4
-rw-r--r--textproc/libodfgen/Makefile4
-rw-r--r--textproc/libwps/Makefile4
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/raptor2/Makefile4
-rw-r--r--textproc/sablotron/Makefile4
-rw-r--r--textproc/scim-table-imengine/Makefile4
-rw-r--r--www/flickcurl/Makefile4
-rw-r--r--www/gstreamer1-plugins-neon/Makefile2
-rw-r--r--www/libecap/Makefile4
-rw-r--r--www/swfdec-plugin/Makefile4
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile2
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-egalax/Makefile1
-rw-r--r--x11-drivers/xf86-input-egalax/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile4
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile2
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile4
-rw-r--r--x11-drivers/xf86-input-hyperpen/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile4
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile2
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile3
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile2
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile1
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile4
-rw-r--r--x11-drivers/xf86-input-penmount/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile4
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile2
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-void/Makefile4
-rw-r--r--x11-drivers/xf86-input-void/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-apm/Makefile2
-rw-r--r--x11-drivers/xf86-video-apm/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-ark/Makefile2
-rw-r--r--x11-drivers/xf86-video-ark/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-ati/Makefile4
-rw-r--r--x11-drivers/xf86-video-ati/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-chips/Makefile2
-rw-r--r--x11-drivers/xf86-video-chips/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile2
-rw-r--r--x11-drivers/xf86-video-cirrus/pkg-plist3
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile2
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile2
-rw-r--r--x11-drivers/xf86-video-dummy/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile2
-rw-r--r--x11-drivers/xf86-video-fbdev/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-glint/Makefile2
-rw-r--r--x11-drivers/xf86-video-glint/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i128/Makefile2
-rw-r--r--x11-drivers/xf86-video-i128/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i740/Makefile2
-rw-r--r--x11-drivers/xf86-video-i740/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-intel/Makefile4
-rw-r--r--x11-drivers/xf86-video-intel/pkg-plist8
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile2
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-mga/Makefile2
-rw-r--r--x11-drivers/xf86-video-mga/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile2
-rw-r--r--x11-drivers/xf86-video-neomagic/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-newport/Makefile2
-rw-r--r--x11-drivers/xf86-video-newport/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-nv/Makefile2
-rw-r--r--x11-drivers/xf86-video-nv/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile2
-rw-r--r--x11-drivers/xf86-video-openchrome/pkg-plist3
-rw-r--r--x11-drivers/xf86-video-r128/Makefile2
-rw-r--r--x11-drivers/xf86-video-r128/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile2
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile2
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3/Makefile2
-rw-r--r--x11-drivers/xf86-video-s3/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile2
-rw-r--r--x11-drivers/xf86-video-s3virge/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-savage/Makefile2
-rw-r--r--x11-drivers/xf86-video-savage/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-scfb/Makefile2
-rw-r--r--x11-drivers/xf86-video-scfb/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile2
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sis-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis-intel/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sis/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile2
-rw-r--r--x11-drivers/xf86-video-sunffb/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile2
-rw-r--r--x11-drivers/xf86-video-tdfx/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tga/Makefile2
-rw-r--r--x11-drivers/xf86-video-tga/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-trident/Makefile2
-rw-r--r--x11-drivers/xf86-video-trident/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile2
-rw-r--r--x11-drivers/xf86-video-tseng/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile2
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile2
-rw-r--r--x11-drivers/xf86-video-vmware/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile2
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-plist1
-rw-r--r--x11-fm/nautilus/Makefile6
-rw-r--r--x11-fm/rodent/Makefile4
-rw-r--r--x11-fonts/libFS/Makefile1
-rw-r--r--x11-fonts/libXfont/Makefile2
-rw-r--r--x11-fonts/libXfontcache/Makefile2
-rw-r--r--x11-fonts/libXft/Makefile2
-rw-r--r--x11-fonts/libfontenc/Makefile2
-rw-r--r--x11-servers/xorg-server/Makefile7
-rw-r--r--x11-themes/gtk-blueprint-engine/Makefile3
-rw-r--r--x11-toolkits/SoXt/Makefile4
-rw-r--r--x11-toolkits/bakery/Makefile6
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/fox14/Makefile4
-rw-r--r--x11-toolkits/fox16/Makefile4
-rw-r--r--x11-toolkits/fox17/Makefile4
-rw-r--r--x11-toolkits/fxscintilla/Makefile4
-rw-r--r--x11-toolkits/gal2/Makefile6
-rw-r--r--x11-toolkits/gdl/Makefile4
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile4
-rw-r--r--x11-toolkits/gstreamer1-plugins-pango/Makefile2
-rw-r--r--x11-toolkits/gtkdatabox/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile4
-rw-r--r--x11-toolkits/gtkglarea2/Makefile8
-rw-r--r--x11-toolkits/gtkmm20/Makefile4
-rw-r--r--x11-toolkits/gtkmm30/Makefile4
-rw-r--r--x11-toolkits/gtksourceview/Makefile6
-rw-r--r--x11-toolkits/gtksourceview2/Makefile6
-rw-r--r--x11-toolkits/gtksourceview3/Makefile6
-rw-r--r--x11-toolkits/gtksourceviewmm3/Makefile4
-rw-r--r--x11-toolkits/libXaw/Makefile2
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXt/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libgdiplus/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile4
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile4
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile4
-rw-r--r--x11-toolkits/libunique3/Makefile3
-rw-r--r--x11-toolkits/libzvt/Makefile4
-rw-r--r--x11-toolkits/mowitz/Makefile4
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile6
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile6
-rw-r--r--x11-toolkits/py-gnome2/Makefile6
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile4
-rw-r--r--x11-toolkits/vdk/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile4
-rw-r--r--x11-wm/compiz-plugins-main/Makefile4
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile4
-rw-r--r--x11-wm/compiz/Makefile4
-rw-r--r--x11-wm/compizconfig-backend-gconf/Makefile4
-rw-r--r--x11-wm/emerald/Makefile6
-rw-r--r--x11-wm/libcompizconfig/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile6
-rw-r--r--x11-wm/metacity/Makefile4
-rw-r--r--x11-wm/mutter/Makefile4
-rw-r--r--x11-wm/openbox/Makefile4
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile6
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gstreamer1-plugins-x/Makefile2
-rw-r--r--x11/gstreamer1-plugins-ximagesrc/Makefile2
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXTrap/Makefile2
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXcm/Makefile2
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdmcp/Makefile2
-rw-r--r--x11/libXevie/Makefile2
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXfixes/Makefile2
-rw-r--r--x11/libXi/Makefile2
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXp/Makefile2
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXprintAppUtil/Makefile2
-rw-r--r--x11/libXprintUtil/Makefile2
-rw-r--r--x11/libXrandr/Makefile2
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile2
-rw-r--r--x11/libXtst/Makefile2
-rw-r--r--x11/libXv/Makefile2
-rw-r--r--x11/libXvMC/Makefile2
-rw-r--r--x11/libXxf86dga/Makefile2
-rw-r--r--x11/libXxf86misc/Makefile2
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libdmx/Makefile2
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnomekbd/Makefile4
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/libmatekbd/Makefile4
-rw-r--r--x11/liboldX/Makefile2
-rw-r--r--x11/libxcb/Makefile2
-rw-r--r--x11/libxkbcommon/Makefile1
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbui/Makefile2
-rw-r--r--x11/libxklavier/Makefile4
-rw-r--r--x11/libxshmfence/Makefile2
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/xcb-util-cursor/Makefile2
-rw-r--r--x11/xcb-util-image/Makefile2
-rw-r--r--x11/xcb-util-keysyms/Makefile2
-rw-r--r--x11/xcb-util-renderutil/Makefile2
-rw-r--r--x11/xcb-util-wm/Makefile2
-rw-r--r--x11/xcb-util/Makefile2
-rw-r--r--x11/xrx/Makefile4
-rw-r--r--x11/xtrans/Makefile1
462 files changed, 727 insertions, 722 deletions
diff --git a/CHANGES b/CHANGES
index a5a284175208..0740914744e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20140423:
+AUTHOR: tijl@FreeBSD.org
+
+ The semantics of USES=libtool have changed. It now deletes .la libraries
+ from the staging area to reduce overlinking. USES=libtool:keepla can be
+ used in case they need to be kept. This form still modifies .la libraries
+ to remove references to other libraries to reduce overlinking.
+
+ Note that .la libraries have to kept around as long as there are .la
+ libraries from other ports that refer to them. Those ports need to use
+ some form of USES=libtool first such that those references are removed.
+
20140419:
AUTHOR: bdrewery@FreeBSD.org
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index 0f4c401c0a9a..64a85dfd5b93 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -3,7 +3,13 @@
# Bring libtool scripts up to date.
#
# Feature: libtool
-# Usage: USES=libtool
+# Usage: USES=libtool or USES=libtool:args
+# Valid args: keepla Normally libtool libraries (*.la) are not installed.
+# With this option they are. This is needed as long
+# as there are dependent ports with .la libraries that
+# refer to .la libraries in this port. As soon as all
+# those dependent ports have some form of USES=libtool
+# keepla can be removed.
#
# MAINTAINER: autotools@FreeBSD.org
@@ -54,4 +60,13 @@ patch-libtool:
/versuffix=/s/=.*/="$$major.$$age.$$revision"/; }'
.endif
+patch-lafiles:
+.if ${libtool_ARGS} == keepla || ${libtool_ARGS} == oldver
+ @${FIND} ${STAGEDIR} -type f -name '*.la' | \
+ ${XARGS} ${SED} -i '' -e "/dependency_libs=/s/=.*/=''/"
+.else
+ @${FIND} ${STAGEDIR} -type f -name '*.la' | \
+ ${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
+.endif
+
.endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 02a5c97547bd..40f800defe53 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -6530,22 +6530,26 @@ _STAGE_DEP= build
_STAGE_SEQ= stage-message stage-dir run-depends lib-depends apply-slist pre-install generate-plist \
pre-su-install
.if defined(NEED_ROOT)
-_STAGE_SUSEQ= create-users-groups do-install desktop-file-post-install kmod-post-install \
- shared-mime-post-install webplugin-post-install \
- post-install post-install-script move-uniquefiles post-stage compress-man \
+_STAGE_SUSEQ= create-users-groups do-install desktop-file-post-install \
+ kmod-post-install shared-mime-post-install \
+ webplugin-post-install post-install post-install-script \
+ move-uniquefiles post-stage compress-man patch-lafiles \
install-rc-script install-ldconfig-file install-license \
- install-desktop-entries add-plist-info add-plist-docs add-plist-examples \
- add-plist-data add-plist-post move-uniquefiles-plist fix-plist-sequence
+ install-desktop-entries add-plist-info add-plist-docs \
+ add-plist-examples add-plist-data add-plist-post \
+ move-uniquefiles-plist fix-plist-sequence
.if defined(DEVELOPER)
_STAGE_SUSEQ+= stage-qa
.endif
.else
-_STAGE_SEQ+= create-users-groups do-install desktop-file-post-install kmod-post-install \
- shared-mime-post-install webplugin-post-install post-install post-install-script \
- move-uniquefiles post-stage compress-man install-rc-script install-ldconfig-file \
- install-license install-desktop-entries add-plist-info add-plist-docs \
- add-plist-examples add-plist-data add-plist-post move-uniquefiles-plist \
- fix-plist-sequence
+_STAGE_SEQ+= create-users-groups do-install desktop-file-post-install \
+ kmod-post-install shared-mime-post-install \
+ webplugin-post-install post-install post-install-script \
+ move-uniquefiles post-stage compress-man patch-lafiles \
+ install-rc-script install-ldconfig-file install-license \
+ install-desktop-entries add-plist-info add-plist-docs \
+ add-plist-examples add-plist-data add-plist-post \
+ move-uniquefiles-plist fix-plist-sequence
.if defined(DEVELOPER)
_STAGE_SEQ+= stage-qa
.endif
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 106463146e58..124c2c958cf7 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -140,7 +140,7 @@ post-install:
.endif
. if ${XORG_CAT} == "lib"
-USES+= pathfix libtool
+USES+= pathfix libtool:keepla
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 52f308fab6a3..8ac3131d1ef2 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libcomprex
PORTVERSION= 0.3.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= archivers
MASTER_SITES= SF/gnupdate/${PORTNAME}/${PORTVERSION}
@@ -16,7 +16,7 @@ OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
INSTALL_TARGET= install-strip
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index 10298180a832..3536256f8119 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdynamite
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= SF/synce/Dynamite/${PORTVERSION}
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Decompress data compressed with PKWARE Data Compression Library
GNU_CONFIGURE= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 36ea3ac2f01d..eb753be217f5 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -3,6 +3,7 @@
PORTNAME= liborange
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= SF/synce/Orange/${PORTVERSION}
@@ -22,7 +23,7 @@ VISE_DESC= Build with expermential VISE support
MSI_DESC= Build with expermential MSI support
GNU_CONFIGURE= yes
-USES= iconv libtool pathfix pkgconfig
+USES= iconv libtool:keepla pathfix pkgconfig
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index 9c07b2cb4117..1fd18330269a 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= librtfcomp
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= SF/synce/SynCE/${PORTNAME}
@@ -13,8 +13,8 @@ COMMENT?= Library for handling compressed RTF documents
LICENSE= LGPL21
GNU_CONFIGURE= yes
+USES= libtool:keepla
USE_LDCONFIG= yes
-USES= libtool
SLAVEDIRS= archivers/py-librtfcomp
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 6456c75c33d8..9bcb0b121bf7 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lzo2
PORTVERSION= 2.06
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers devel
MASTER_SITES= http://www.oberhumer.com/opensource/lzo/download/ \
LOCAL/mandree
@@ -14,7 +14,7 @@ COMMENT= Portable speedy, lossless data compression library
LICENSE= GPLv2
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --docdir=${DOCSDIR}
USE_LDCONFIG= yes
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 135f5626275d..a274e2f47ad3 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ucl
PORTVERSION= 1.03
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers devel
MASTER_SITES= http://www.oberhumer.com/opensource/ucl/download/
@@ -14,7 +14,7 @@ LICENSE= GPLv2
OPTIONS_DEFINE= DOCS
-USES= libtool
+USES= libtool:keepla
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index 63559964b341..ef7521233e04 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unshield
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers
MASTER_SITES= SF/synce/Unshield/${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE= MIT
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
post-build:
@${STRIP_CMD} ${WRKSRC}/lib/.libs/libunshield.so.0.0.0
diff --git a/audio/gstreamer1-plugins-a52dec/Makefile b/audio/gstreamer1-plugins-a52dec/Makefile
index a01e0f3298e6..627aa1b549ff 100644
--- a/audio/gstreamer1-plugins-a52dec/Makefile
+++ b/audio/gstreamer1-plugins-a52dec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
diff --git a/audio/gstreamer1-plugins-amrnb/Makefile b/audio/gstreamer1-plugins-amrnb/Makefile
index 299d979c00b0..e4affcd3916a 100644
--- a/audio/gstreamer1-plugins-amrnb/Makefile
+++ b/audio/gstreamer1-plugins-amrnb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin
diff --git a/audio/gstreamer1-plugins-amrwbdec/Makefile b/audio/gstreamer1-plugins-amrwbdec/Makefile
index 16ca74769856..0306bafd62b7 100644
--- a/audio/gstreamer1-plugins-amrwbdec/Makefile
+++ b/audio/gstreamer1-plugins-amrwbdec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
PKGNAMESUFFIX= 1-plugins-amrwbdec
diff --git a/audio/gstreamer1-plugins-cdparanoia/Makefile b/audio/gstreamer1-plugins-cdparanoia/Makefile
index b6db5390dfc8..39955348eda7 100644
--- a/audio/gstreamer1-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer1-plugins-cdparanoia/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/gstreamer1-plugins-faac/Makefile b/audio/gstreamer1-plugins-faac/Makefile
index 02fb5733f92d..1951541b7552 100644
--- a/audio/gstreamer1-plugins-faac/Makefile
+++ b/audio/gstreamer1-plugins-faac/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
diff --git a/audio/gstreamer1-plugins-faad/Makefile b/audio/gstreamer1-plugins-faad/Makefile
index 8bc4a9be70a9..5342fcd19c95 100644
--- a/audio/gstreamer1-plugins-faad/Makefile
+++ b/audio/gstreamer1-plugins-faad/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
diff --git a/audio/gstreamer1-plugins-flac/Makefile b/audio/gstreamer1-plugins-flac/Makefile
index 32c266fdd22a..2cf089220a98 100644
--- a/audio/gstreamer1-plugins-flac/Makefile
+++ b/audio/gstreamer1-plugins-flac/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer free lossless audio encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-flite/Makefile b/audio/gstreamer1-plugins-flite/Makefile
index 9668cf960a40..10fbbd152823 100644
--- a/audio/gstreamer1-plugins-flite/Makefile
+++ b/audio/gstreamer1-plugins-flite/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer flite run-time speech synthesis engine plugin
diff --git a/audio/gstreamer1-plugins-gme/Makefile b/audio/gstreamer1-plugins-gme/Makefile
index 538deb08fdae..0d923e5015ad 100644
--- a/audio/gstreamer1-plugins-gme/Makefile
+++ b/audio/gstreamer1-plugins-gme/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer gme plugin
diff --git a/audio/gstreamer1-plugins-gsm/Makefile b/audio/gstreamer1-plugins-gsm/Makefile
index bd12b0e89580..a25366bb139d 100644
--- a/audio/gstreamer1-plugins-gsm/Makefile
+++ b/audio/gstreamer1-plugins-gsm/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer gsm encoding/decoding plugin
diff --git a/audio/gstreamer1-plugins-jack/Makefile b/audio/gstreamer1-plugins-jack/Makefile
index f83f8ca4b91b..c5cd3594858e 100644
--- a/audio/gstreamer1-plugins-jack/Makefile
+++ b/audio/gstreamer1-plugins-jack/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer low-latency audio server plugin
diff --git a/audio/gstreamer1-plugins-lame/Makefile b/audio/gstreamer1-plugins-lame/Makefile
index 2acfcc012a94..689c067b5094 100644
--- a/audio/gstreamer1-plugins-lame/Makefile
+++ b/audio/gstreamer1-plugins-lame/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer mp3 encode plugin
diff --git a/audio/gstreamer1-plugins-mad/Makefile b/audio/gstreamer1-plugins-mad/Makefile
index b1d6ec73fa9b..71bb2fa45010 100644
--- a/audio/gstreamer1-plugins-mad/Makefile
+++ b/audio/gstreamer1-plugins-mad/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer mp3 decoder plugin
diff --git a/audio/gstreamer1-plugins-modplug/Makefile b/audio/gstreamer1-plugins-modplug/Makefile
index 77e06c33ab9a..d901a1091b53 100644
--- a/audio/gstreamer1-plugins-modplug/Makefile
+++ b/audio/gstreamer1-plugins-modplug/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer modplug plugin
diff --git a/audio/gstreamer1-plugins-ogg/Makefile b/audio/gstreamer1-plugins-ogg/Makefile
index d072013cc22b..2a4b912ae688 100644
--- a/audio/gstreamer1-plugins-ogg/Makefile
+++ b/audio/gstreamer1-plugins-ogg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer Ogg bitstream plugin
diff --git a/audio/gstreamer1-plugins-opus/Makefile b/audio/gstreamer1-plugins-opus/Makefile
index f8080177e474..a08d9426effc 100644
--- a/audio/gstreamer1-plugins-opus/Makefile
+++ b/audio/gstreamer1-plugins-opus/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer Opus audio encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-shout2/Makefile b/audio/gstreamer1-plugins-shout2/Makefile
index bbd80d4c11e3..48a04b3d9bd1 100644
--- a/audio/gstreamer1-plugins-shout2/Makefile
+++ b/audio/gstreamer1-plugins-shout2/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer icecast plugin
diff --git a/audio/gstreamer1-plugins-sidplay/Makefile b/audio/gstreamer1-plugins-sidplay/Makefile
index 34ceef01da44..20c4ce11f107 100644
--- a/audio/gstreamer1-plugins-sidplay/Makefile
+++ b/audio/gstreamer1-plugins-sidplay/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer Commodore SID decoder plugin
diff --git a/audio/gstreamer1-plugins-soundtouch/Makefile b/audio/gstreamer1-plugins-soundtouch/Makefile
index e47e9b95084a..f9b0d047dc87 100644
--- a/audio/gstreamer1-plugins-soundtouch/Makefile
+++ b/audio/gstreamer1-plugins-soundtouch/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= GStreamer soundtouch plugin
diff --git a/audio/gstreamer1-plugins-speex/Makefile b/audio/gstreamer1-plugins-speex/Makefile
index 3645d07e676d..6d1b7d98b89d 100644
--- a/audio/gstreamer1-plugins-speex/Makefile
+++ b/audio/gstreamer1-plugins-speex/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer speex voice plugin
diff --git a/audio/gstreamer1-plugins-taglib/Makefile b/audio/gstreamer1-plugins-taglib/Makefile
index affe2063feea..890e674540f4 100644
--- a/audio/gstreamer1-plugins-taglib/Makefile
+++ b/audio/gstreamer1-plugins-taglib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer taglib plugin
diff --git a/audio/gstreamer1-plugins-twolame/Makefile b/audio/gstreamer1-plugins-twolame/Makefile
index 7703d2435d69..ade9a987e4b3 100644
--- a/audio/gstreamer1-plugins-twolame/Makefile
+++ b/audio/gstreamer1-plugins-twolame/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer High-quality free MP2 encoder plugin
diff --git a/audio/gstreamer1-plugins-vorbis/Makefile b/audio/gstreamer1-plugins-vorbis/Makefile
index d247bf880775..15be70724e9f 100644
--- a/audio/gstreamer1-plugins-vorbis/Makefile
+++ b/audio/gstreamer1-plugins-vorbis/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer vorbis encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-wavpack/Makefile b/audio/gstreamer1-plugins-wavpack/Makefile
index 34b2fe9212e6..7c9535ed22ea 100644
--- a/audio/gstreamer1-plugins-wavpack/Makefile
+++ b/audio/gstreamer1-plugins-wavpack/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= Gstreamer wavpack plugin
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index bd4b8e121ec4..4a2d2f164a9e 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= id3lib
PORTVERSION= 3.8.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF
@@ -11,7 +11,7 @@ MAINTAINER= kaeru@inigo-tech.com
COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
GNU_CONFIGURE= yes
-USES= iconv libtool
+USES= iconv libtool:keepla
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index ed9e534c315b..367058441e91 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libcddb
PORTVERSION= 1.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 2759dc2b4070..91c75f7b3bca 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmad
PORTVERSION= 0.15.1b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION}
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 5a0b6ac0209a..43e179b31f16 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libmikmod
PORTVERSION= 3.3.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/mikmod/libmikmod/${PORTVERSION}/
@@ -11,7 +12,7 @@ COMMENT= MikMod Sound Library
LICENSE= LGPL21
-USES= gmake libtool pkgconfig
+USES= gmake libtool:keepla pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-esd
USE_LDCONFIG= yes
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 0cc0b3a1dc8e..9592060ad4b9 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libsamplerate
PORTVERSION= 0.1.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.mega-nerd.com/SRC/
@@ -12,7 +12,7 @@ COMMENT= Secret Rabbit Code: a Sample Rate Converter for audio
LICENSE= GPLv2
-USES= pathfix pkgconfig libtool:oldver
+USES= libtool:oldver pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index 51a7500e980f..3a2d376a4514 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libtremor
PORTVERSION= 1.2.0.s20040213
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://members.chello.nl/~g.mast/distfiles/
DISTNAME= tremor_snapshot_${SNAP_DATE}
@@ -13,7 +14,7 @@ COMMENT= Integer-only fully Ogg Vorbis compliant decoder library
SNAP_DATE= 02132004
WRKSRC= ${WRKDIR}/Tremor
-USES= libtool
+USES= libtool:keepla
USE_AUTOTOOLS= aclocal automake autoconf libtoolize
AUTOMAKE_ARGS= -a -c
LIBTOOLIZE_ARGS=-i -c
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 2e864596522f..3518ea23651b 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mpg123
PORTVERSION= 1.19.0
+PORTREVISION= 1
CATEGORIES= audio ipv6
MASTER_SITES= SF \
http://www.mpg123.de/download/
@@ -12,7 +13,7 @@ COMMENT= Command-line player for MPEG Layer 1, 2, and 3 audio files
LICENSE= LGPL21
-USES= libtool gmake pathfix
+USES= gmake libtool:keepla pathfix
USE_BZIP2= yes
USE_AUTOTOOLS= libltdl
USE_LDCONFIG= yes
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index e7627af4c442..082409de7c8f 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -4,6 +4,7 @@
PORTNAME= pd
DISTVERSION= 0.45-4
DISTVERSIONSUFFIX= .src
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://msp.ucsd.edu/Software/
@@ -20,7 +21,7 @@ OPTIONS_DEFAULT=FFTW
WRKSRC= ${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
-USES= gettext gmake libtool pkgconfig shebangfix tk:wrapper
+USES= gettext gmake libtool:keepla pkgconfig shebangfix tk:wrapper
SHEBANG_FILES= tcl/pkg_mkIndex.tcl
SHEBANG_LANG= tclsh
tclsh_OLD_CMD= /usr/bin/tclsh
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 2e42d4d94981..aecf7e16db9c 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.12.8
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +24,8 @@ LIB_DEPENDS= libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
CONFLICTS= rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
-USES= gettext gmake pathfix pkgconfig tar:bzip2 libtool desktop-file-utils
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig tar:bzip2
INSTALLS_OMF= yes
USE_GNOME= intlhack gnomeprefix gtk20 nautilus2
WANT_GNOME= yes
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index deeabe59ccd2..5efdef4ee21b 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= speex
DISTVERSION= 1.2rc1
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.us.xiph.org/releases/speex/
@@ -13,7 +13,7 @@ COMMENT= Open-source patent-free voice codec
LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg
-USES= libtool pathfix
+USES= libtool:keepla pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE}
diff --git a/benchmarks/iperf3/Makefile b/benchmarks/iperf3/Makefile
index f6642845fafb..0a2b591808e0 100644
--- a/benchmarks/iperf3/Makefile
+++ b/benchmarks/iperf3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= iperf
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= benchmarks ipv6
MASTER_SITES= http://stats.es.net/software/
PKGNAMESUFFIX= 3
@@ -13,8 +14,8 @@ COMMENT= Improved tool to measure TCP and UDP bandwidth
LICENSE= BSD3CLAUSE
GNU_CONFIGURE= yes
+USES= libtool:keepla
USE_LDCONFIG= yes
-USES= libtool
# Set ${DOCSDIR} to avoid conflict with benchmarks/iperf ${DOCSDIR}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 787989d602fd..afa1b56d5e59 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -16,10 +16,10 @@ BROKEN= Does not build with modern compilers
LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf automake libtool
+USE_AUTOTOOLS= autoconf automake
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
-USES= gmake tar:bzip2 libtool
+USES= gmake libtool tar:bzip2
USE_GCC= any
PLIST_FILES= bin/aldo \
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index d725c003da42..61e783cdaeb8 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsmlib
PORTVERSION= 1.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= comms
MASTER_SITES= DEBIAN
#TODO: examine the Debian patches, and changes in the Mandrake
@@ -13,7 +13,7 @@ DISTFILES= gsmlib_1.10.orig.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to access GSM mobile phones through GSM modems
-USES= gmake libtool
+USES= gmake libtool:keepla
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/comms/gstreamer1-plugins-spandsp/Makefile b/comms/gstreamer1-plugins-spandsp/Makefile
index cc82fd04ac9f..8ab43117c1a0 100644
--- a/comms/gstreamer1-plugins-spandsp/Makefile
+++ b/comms/gstreamer1-plugins-spandsp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= comms
COMMENT= Gstreamer DSP library and software FAX machine plugin
diff --git a/comms/hidapi/Makefile b/comms/hidapi/Makefile
index d86efc7b9b73..1cc6ed509778 100644
--- a/comms/hidapi/Makefile
+++ b/comms/hidapi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hidapi
DISTVERSION= 0.8.0-rc1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MAINTAINER= tijl@FreeBSD.org
diff --git a/comms/hidapi/pkg-plist b/comms/hidapi/pkg-plist
index 080770b4c595..60ef37dd32f4 100644
--- a/comms/hidapi/pkg-plist
+++ b/comms/hidapi/pkg-plist
@@ -1,6 +1,5 @@
include/hidapi/hidapi.h
lib/libhidapi.a
-lib/libhidapi.la
lib/libhidapi.so
lib/libhidapi.so.0
lib/libhidapi.so.0.0.0
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 60ca5c3f3105..2671220c546c 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= recode
PORTVERSION= 3.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= recode
@@ -12,7 +12,7 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= Converts files between character sets and usages
GNU_CONFIGURE= yes
-USES= gettext iconv libtool perl5
+USES= gettext iconv libtool:keepla perl5
USE_PERL5= run build
USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-included-gettext
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index a00d70c91efc..6c2eb9250b13 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glom
PORTVERSION= 1.12.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +29,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
USE_BZIP2= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info
USE_GNOME= gnomedocutils gnomeprefix pygnomeextras
USE_LDCONFIG= yes
USE_PGSQL= yes
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 9b0056b9102a..98c88e305f10 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgdamm
PORTVERSION= 3.99.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,7 @@ COMMENT= C++ wrapper for libgda4 library
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= glibmm libgda4
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 3adedfe3b49a..d5b38b870965 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libiodbc
PORTVERSION= 3.52.8
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF/iodbc/iodbc/${PORTVERSION}
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index 51387f2bf88c..e09ee151df30 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libzdb
PORTVERSION= 2.11.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://www.tildeslash.com/libzdb/dist/ \
http://www.c-s.li/ports/
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=MYSQL SQLITE PGSQL
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gmake libtool pathfix
+USES= gmake libtool:keepla pathfix
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile
index 4dafe5f4b273..cfcce6078b89 100644
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vsqlite
PORTVERSION= 0.3.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MAINTAINER= kwm@FreeBSD.org
@@ -20,7 +20,7 @@ GH_TAGNAME= 3fa8d32
GH_COMMIT= 3fa8d32
USE_AUTOTOOLS= libtoolize autoconf automake
-USES= compiler:c++0x libtool
+USES= compiler:c++0x libtool:keepla
USE_SQLITE= 3
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile
index f65b09f36f05..e1bf490c4c37 100644
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bitcollider
PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils multimedia
MASTER_SITES= SF/${PORTNAME}/Bitcollider/${PORTVERSION}
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Bitzi metadata generator
GNU_CONFIGURE= yes
-USES= libtool
+USES= libtool:keepla
USE_LDCONFIG= yes
CFLAGS+= -lm
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 8ee5f8b0ff31..2ca60f8999a6 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkjournal
PORTVERSION= 0.3.5.b
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= deskutils gnome
MASTER_SITES= http://sourcefiles.org/Productivity_Tools/Diary/ \
LOCAL/beech
@@ -21,9 +21,9 @@ PLIST_FILES= bin/gtkjournal man/man1/gtkjournal.1.gz \
lib/libsqlitemm.so lib/libsqlitemm.so.0 \
lib/libsqlitemm.so.0.0.1
+USES= gmake libtool:keepla pathfix pkgconfig
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USES= gmake libtool pathfix pkgconfig
CONFIGURE_ARGS= --enable-gtkspell
USE_LDCONFIG= yes
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index cb4f6693a6a0..21e267b8ee39 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= notify-osd
PORTVERSION= 0.9.29
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= http://launchpadlibrarian.net/43419242/ \
CRITICAL
@@ -20,8 +20,11 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus
GNU_CONFIGURE= yes
-USES= gmake pkgconfig
+USES= gmake libtool pkgconfig
USE_GNOME= libwnck gconf2
+USE_XORG= pixman
USE_GCC= yes
+LDFLAGS+= -L${LOCALBASE}/lib -lpixman-1
+
.include <bsd.port.mk>
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index fd3f7e57bd5d..b148f1dfebdc 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -4,7 +4,7 @@
PORTNAME= anjuta-extras
PORTVERSION= 2.32.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -13,7 +13,7 @@ COMMENT= Extra anjuta plugins
LIB_DEPENDS= libanjuta.so:${PORTSDIR}/devel/anjuta
-USES= gmake libtool tar:bzip2
+USES= gmake libtool:keepla tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index e622ab57a286..bc5cb8a05f33 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -4,7 +4,7 @@
PORTNAME= anjuta
PORTVERSION= 2.32.1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,8 +30,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
CONFLICTS= anjuta-3.[0-9]*
-USES= desktop-file-utils gmake gettext libtool pathfix perl5 pkgconfig \
- shebangfix shared-mime-info tar:bzip2
+USES= desktop-file-utils gmake gettext libtool:keepla pathfix \
+ perl5 pkgconfig shared-mime-info shebangfix tar:bzip2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index c56de60b8a40..d18667adcca5 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -4,7 +4,7 @@
PORTNAME= bug-buddy
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ COMMENT= Bug reporting tool for GNOME 2
LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 365c34285999..d5d96924ee22 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dbus
PORTVERSION= 1.6.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -16,7 +16,7 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
PORTSCOUT= limitw:1,even
USE_GNOME= libxml2
-USES= gmake libtool pathfix
+USES= gmake libtool:keepla pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS=--localstatedir=/var \
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index c2ec3152eb18..bf2f345da4a2 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -4,7 +4,7 @@
PORTNAME= devhelp
PORTVERSION= 2.32.0
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -19,7 +19,7 @@ LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
CONFLICTS= devhelp-3.[0-9]*
USE_XORG= x11
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= intlhack gnomeprefix libgnomeui libwnck
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index ccd1d410ff60..db71b0b3977e 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -4,7 +4,7 @@
PORTNAME= eggdbus
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -14,7 +14,7 @@ COMMENT= D-Bus bindings for GObject
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
USE_GNOME= glib20
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
MAKE_JOBS_UNSAFE=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 7f7d30cc3eb7..6ed9f1891d00 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gconfmm
PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,7 @@ LIB_DEPENDS= libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11
USE_GNOME= gconf2 referencehack
GNU_CONFIGURE= yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index cb0e31b44eb4..2b9f8a809676 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glade3
PORTVERSION= 3.8.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ PORTSCOUT= ignore
INSTALLS_ICONS= yes
USE_GNOME= gtk20 libxml2 gnomeprefix gnomedocutils
-USES= gmake gettext libtool pathfix desktop-file-utils pkgconfig tar:xz
+USES= gmake gettext libtool:keepla pathfix desktop-file-utils pkgconfig tar:xz
INSTALLS_OMF= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 9d046b8feea6..ccb625435eeb 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glibmm
PORTVERSION= 2.36.2
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -21,7 +21,7 @@ PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gettext gmake libtool pathfix perl5 pkgconfig
+USES= gettext gmake libtool:keepla pathfix perl5 pkgconfig
USE_GNOME= glib20 libsigc++20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index a93bdcb86629..54e60dbc0457 100644
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -4,15 +4,15 @@
PORTNAME= gnome-vfs-monikers
PORTVERSION= 2.15.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome-vfs monikers module
+USES= gmake libtool:keepla pkgconfig
USE_GNOME= gnomevfs2 libbonobo
-USES= gmake libtool pkgconfig
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index ba250bb8cf7b..a67634812777 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 2.24.4
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ USES= tar:bzip2
RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
-USES+= libtool pathfix gettext gmake pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack gnomemimedata gconf2 \
referencehack
INSTALL_TARGET= install-strip
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 28717ece2e50..32d8f19d0362 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-vfsmm
PORTVERSION= 2.26.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -14,7 +14,7 @@ COMMENT= C++ wrapper for gnomevfs2 library
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= glibmm gnomevfs2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/goffice010/Makefile b/devel/goffice010/Makefile
index 870eadf559bd..daef2a2cdc5e 100644
--- a/devel/goffice010/Makefile
+++ b/devel/goffice010/Makefile
@@ -4,6 +4,7 @@
PORTNAME= goffice
PORTVERSION= 0.10.11
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 010
@@ -16,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_XZ= yes
USE_GNOME= gnomeprefix gtk30 intlhack libgsf librsvg2
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/gstreamer1-plugins-soup/Makefile b/devel/gstreamer1-plugins-soup/Makefile
index 77b7ac08c26e..f9bbcfdfac0d 100644
--- a/devel/gstreamer1-plugins-soup/Makefile
+++ b/devel/gstreamer1-plugins-soup/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
COMMENT= Gstreamer soup http src plugin
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index f367b4b879b3..fa923a511106 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Judy
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
@@ -11,7 +12,7 @@ COMMENT= General purpose dynamic array
LICENSE= LGPL21
-USES= gmake libtool
+USES= gmake libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= YES
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index ab15be6da6c9..537e14f4cd25 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libIDL
PORTVERSION= 0.8.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library for creating trees of CORBA IDL files
-USES= gmake bison libtool pathfix pkgconfig gettext tar:bzip2
+USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= glib20
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile
index 356b44cf7ff3..9d34e7f86007 100644
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libdaemon
PORTVERSION= 0.14
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
@@ -10,8 +11,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight C library that eases the writing of UNIX daemons
CONFIGURE_ARGS= --disable-lynx
-USES= libtool pathfix
GNU_CONFIGURE= yes
+USES= libtool:keepla pathfix
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index 54fec866f84a..6bf5b7bddeeb 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdnsres
PORTVERSION= 0.1a
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://monkey.org/~provos/
@@ -12,7 +12,7 @@ COMMENT= Provides a non-blocking thread-safe API for resolving DNS names
BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS=--with-libevent=${LOCALBASE}
diff --git a/devel/libevt/Makefile b/devel/libevt/Makefile
index 2e1445e7159c..75c65eb9188c 100644
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libevt
DISTVERSION= alpha-20140411
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSYm01VnUtLXNUZ2M/ \
LOCAL/antoine
@@ -14,7 +15,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= gettext iconv libtool pathfix
+USES= gettext iconv libtool:keepla pathfix
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/libevtx/Makefile b/devel/libevtx/Makefile
index 93df512c7d33..50d0a2f8ae2b 100644
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libevtx
DISTVERSION= alpha-20140323
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSRnQ0SExzX3JjdFE/ \
LOCAL/antoine
@@ -14,7 +15,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= gettext iconv libtool pathfix
+USES= gettext iconv libtool:keepla pathfix
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index 98ae0c954b0a..3d0002f70395 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libewf
PORTVERSION= 20140406
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/ \
LOCAL/antoine
@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-USES= fuse gettext iconv libtool pathfix pkgconfig
+USES= fuse gettext iconv libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_OPENSSL= yes
USE_PYTHON= 2
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index cca08683ffa3..5b42173c5ceb 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgdata
PORTVERSION= 0.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -15,7 +15,7 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
USE_BZIP2= yes
USE_LDCONFIG= yes
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GNOME= glib20 intltool introspection:build
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 81de7f2b3422..a0a671f9a566 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libgee
PORTVERSION= 0.12.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -15,7 +16,7 @@ BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-introspection=yes
USE_XZ= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= glib20 gnomehier introspection:build
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index 2901aad7c849..b8f9fd369707 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libghthash
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
@@ -12,7 +12,7 @@ COMMENT= Generic Hash Table
OPTIONS_DEFINE= DOCS EXAMPLES
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
AUTOMAKE_ARGS= -a -c -f
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 9c241545f028..ecde54161048 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libglademm
PORTVERSION= 2.6.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_XORG= x11 ice
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= libglade2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/liblnk/Makefile b/devel/liblnk/Makefile
index 0c454e3ca58c..c1be15e43063 100644
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= liblnk
PORTVERSION= 20140323
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSQmluVC1YeDVvZWM/ \
LOCAL/antoine
@@ -15,7 +16,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= gettext iconv libtool pathfix
+USES= gettext iconv libtool:keepla pathfix
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/liblogging/Makefile b/devel/liblogging/Makefile
index 1ad76513a46f..4eb711b315e6 100644
--- a/devel/liblogging/Makefile
+++ b/devel/liblogging/Makefile
@@ -3,6 +3,7 @@
PORTNAME= liblogging
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.rsyslog.com/liblogging/
@@ -12,7 +13,7 @@ COMMENT= Easy to use system logging library
LICENSE= BSD2CLAUSE
GNU_CONFIGURE= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblogging-stdlog.so.0.0.0
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 3f0c99e6fcef..3823e69e1ae4 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -3,13 +3,14 @@
PORTNAME= libmimedir
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for parsing RFC2425 MIME Directory Profile information
-USES= bison desthack libtool
+USES= bison desthack libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libmsiecf/Makefile b/devel/libmsiecf/Makefile
index 6432b84c874e..5cdb0057004a 100644
--- a/devel/libmsiecf/Makefile
+++ b/devel/libmsiecf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libmsiecf
DISTVERSION= alpha-20140323
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSVm1MNkw5cU1mUG8/ \
LOCAL/antoine
@@ -14,7 +15,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= gettext iconv libtool pathfix
+USES= gettext iconv libtool:keepla pathfix
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 0f57e33d256f..d983c6f47c2a 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -4,6 +4,7 @@
PORTNAME= liboil
PORTVERSION= 0.3.17
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://liboil.freedesktop.org/download/
@@ -12,7 +13,7 @@ COMMENT= Library of optimized inner loops
LICENSE= BSD2CLAUSE
-USES= libtool pkgconfig
+USES= libtool:keepla pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/devel/libolecf/Makefile b/devel/libolecf/Makefile
index ed27b1c2a2be..d0b1f0468d23 100644
--- a/devel/libolecf/Makefile
+++ b/devel/libolecf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libolecf
DISTVERSION= alpha-20140329
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSS0hEb0pjU2h6a2c/ \
LOCAL/antoine
@@ -14,7 +15,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= fuse gettext iconv libtool pathfix pkgconfig
+USES= fuse gettext iconv libtool:keepla pathfix pkgconfig
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 73399a6028b6..d9f7966ab78d 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= liboobs
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libhal.so:${PORTSDIR}/sysutils/hal
RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_GNOME= glib20
INSTALL_TARGET= install-strip
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 64796f256042..c65ebb2841a5 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libpciaccess
PORTVERSION= 0.13.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= x11@FreeBSD.org
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index f3da893e838d..510807cca252 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libpeas
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,7 +17,7 @@ BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
USE_XZ= yes
USE_PYTHON= 2
USE_LDCONFIG= yes
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk30 introspection:build
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 76ed1b0ee976..57af7c0148eb 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libregf
DISTVERSION= alpha-20140323
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSSC1yUDZpb3l0UHM/ \
LOCAL/antoine
@@ -14,7 +15,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES= fuse gettext iconv libtool pathfix pkgconfig
+USES= fuse gettext iconv libtool:keepla pathfix pkgconfig
USE_PYTHON= 2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 648c519228f1..66797af4bd90 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libsigcx
PORTVERSION= 0.6.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
MASTER_SITES= SF
@@ -15,7 +15,7 @@ LIB_DEPENDS= libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
OPTIONS_DEFINE= STATIC
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index fda89e71b81c..b62e8703a00b 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libsoup
PORTVERSION= 2.40.3
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +20,7 @@ USE_XZ= yes
.if !defined(REFERENCE_PORT)
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gnomehier glib20 libxml2 referencehack intltool
USE_SQLITE= 3
USE_LDCONFIG= yes
diff --git a/devel/libvshadow/Makefile b/devel/libvshadow/Makefile
index ad67b4138d3e..7f571bf402ff 100644
--- a/devel/libvshadow/Makefile
+++ b/devel/libvshadow/Makefile
@@ -3,18 +3,19 @@
PORTNAME= libvshadow
PORTVERSION= 20140323
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://googledrive.com/host/0B3fBvzttpiiSZDZXRFVMdnZCeHc/ \
LOCAL/antoine
DISTNAME= ${PORTNAME}-alpha-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
-COMMENT= A library to support the Volume Service Snapshot (VSS) format
+COMMENT= Library to support the Volume Service Snapshot (VSS) format
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= fuse gettext iconv libtool pathfix pkgconfig
+USES= fuse gettext iconv libtool:keepla pathfix pkgconfig
USE_PYTHON= 2
USE_LDCONFIG= yes
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index eb6dcb522efb..2ab1c4fc7384 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -3,6 +3,7 @@
PORTNAME= log4cplus
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
@@ -11,7 +12,7 @@ COMMENT= Logging library for C++
OPTIONS_DEFINE= DOCS
-USES= libtool pathfix
+USES= libtool:keepla pathfix
USE_XZ= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/mq4cpp/Makefile b/devel/mq4cpp/Makefile
index 24b4b3932ba9..11f52eb0d879 100644
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mq4cpp
PORTVERSION= 1.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.sixtyfourbit.org/Download/
@@ -13,7 +13,7 @@ COMMENT= Message Queuing for C++
OPTIONS_DEFINE= DOCS
USE_LDCONFIG= yes
-USES= dos2unix libtool pathfix pkgconfig
+USES= dos2unix libtool:keepla pathfix pkgconfig
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index 069587a590ef..de174f9dcf60 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= orc
PORTVERSION= 0.4.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://gstreamer.freedesktop.org/data/src/orc/
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake libtool pkgconfig
+USES= gmake libtool:keepla pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--disable-gtk-doc
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index 6578144cbf04..ddcea00cd9c6 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -3,7 +3,7 @@
PORTNAME= protobuf-c
PORTVERSION= 0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -12,7 +12,7 @@ COMMENT= This package provides a code generator and runtime libraries to use Pro
LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf
-USES= gmake pathfix pkgconfig libtool
+USES= gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/pthsem/Makefile b/devel/pthsem/Makefile
index df10bf4880c0..bc038ab36db9 100644
--- a/devel/pthsem/Makefile
+++ b/devel/pthsem/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pthsem
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.auto.tuwien.ac.at/~mkoegler/pth/
DISTFILES= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
@@ -12,7 +13,7 @@ COMMENT= GNU Portable Threads with semaphores
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USES= gmake libtool pathfix
+USES= gmake libtool:keepla pathfix
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 9c96d32d3f58..a6967f284a15 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -3,7 +3,7 @@
PORTNAME= notify
PORTVERSION= 0.1.1
DISTVERSIONPREFIX=python-
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel python
MASTER_SITES= http://www.galago-project.org/files/releases/source/notify-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ OPTIONS_DEFINE= DOCS
LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= pygtk2
INSTALL_TARGET= install-strip
USE_PYTHON= 2
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index a8591595ad66..7260136e0b5a 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rudiments
PORTVERSION= 0.46
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
@@ -11,7 +12,7 @@ COMMENT= C++ class library for daemons, clients, servers, and more
LICENSE= LGPL20
-USES= libtool pkgconfig shebangfix
+USES= libtool:keepla pkgconfig shebangfix
SHEBANG_FILES= doc/programming/insert.pl
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/sdl_console/Makefile b/devel/sdl_console/Makefile
index 6368a454b2f8..6dc6dfd1172f 100644
--- a/devel/sdl_console/Makefile
+++ b/devel/sdl_console/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sdl_console
PORTVERSION= 2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
DISTNAME= sdlconsole-${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME= sdlconsole-${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
COMMENT= Drop down console that can be easily added to any SDL application
-USES= libtool
+USES= libtool:keepla
USE_SDL= sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index d6a38b353f7f..fe21bbfc4b87 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seed
PORTVERSION= 2.31.91
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +24,7 @@ LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi \
CONFLICTS= seed-3.[0-9]*
GNU_CONFIGURE= yes
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gtk20 intltool libxml2
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index 31a6319fe3f0..7d54f5de8fcd 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seed
PORTVERSION= 3.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -25,7 +25,7 @@ LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi \
CONFLICTS= seed-2.[0-9]*
GNU_CONFIGURE= yes
-USES= libtool pathfix gettext gmake pkgconfig tar:xz
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
INSTALL_TARGET= install-strip
USE_GNOME= gtk30 intltool libxml2
USE_LDCONFIG= yes
diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile
index 3b480078f7c2..96953a297597 100644
--- a/devel/stringencoders/Makefile
+++ b/devel/stringencoders/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stringencoders
PORTVERSION= 3.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-v${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Collection of high performance c-string transformations
-USES= perl5 libtool
+USES= libtool:keepla perl5
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/sysfsutils/Makefile b/devel/sysfsutils/Makefile
index 38edb3e88a07..9aec5f1dd6ff 100644
--- a/devel/sysfsutils/Makefile
+++ b/devel/sysfsutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sysfsutils
PORTVERSION= 2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/linux-diag/${PORTNAME}/${PORTVERSION}
@@ -11,7 +11,7 @@ MAINTAINER= gslin@gslin.org
COMMENT= System Utilities Based on Sysfs
GNU_CONFIGURE= yes
-USES= libtool
+USES= libtool:keepla
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index ed5b80751680..626229a0d69c 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -3,7 +3,7 @@
PORTNAME= udis86
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION:R}
@@ -13,7 +13,7 @@ COMMENT= Minimalistic x86 and x86-64 disassembler library
LICENSE= BSD2CLAUSE
-USES= libtool gmake
+USES= gmake libtool:keepla
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/umem/Makefile b/devel/umem/Makefile
index e0645fef9beb..0f1eafc919d4 100644
--- a/devel/umem/Makefile
+++ b/devel/umem/Makefile
@@ -3,14 +3,14 @@
PORTNAME= umem
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://labs.omniti.com/portableumem/releases/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Port of the Solaris memory allocator
-USES= libtool
+USES= libtool:keepla
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index f04f728408b4..6ba495efdd5b 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= varconf
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
@@ -16,7 +16,7 @@ OPTIONS_DEFINE= DOCS
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USES= libtool pathfix pkgconfig compiler:c++11-lib
+USES= compiler:c++11-lib libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 4cf6c312315a..cc6c38ced8fa 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gedit-plugins
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ CONFLICTS= gedit-plugins-3.[0-9]*
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USES= libtool pathfix gettext gmake pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack gnomevfs2
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 87bb740e8dde..eb0e40160a84 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gedit
PORTVERSION= 2.30.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,8 +17,9 @@ LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \
libsoup-2.4.so:${PORTSDIR}/devel/libsoup
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig tar:bzip2
USE_XORG= sm
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:bzip2
INSTALLS_OMF= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index a42da16c11ae..0c5d604febe7 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ghex
PORTVERSION= 2.24.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,8 +12,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 hex editor
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui gnomedocutils
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
INSTALLS_ICONS= yes
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 4faaa7f3e28b..32b0a0af1233 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nvi
PORTVERSION= 1.81.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors
MASTER_SITES= http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/ \
http://www.kotnet.org/~skimo/nvi/devel/
@@ -21,7 +21,7 @@ USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= iconv libtool pkgconfig
+USES= iconv libtool:keepla pkgconfig
USE_BDB= 42+
CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \
--program-prefix=n
diff --git a/french/med/Makefile b/french/med/Makefile
index a99dff7a94ea..8cf2a6ca725a 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -3,6 +3,7 @@
PORTNAME= med
DISTVERSION= 3.0.7
+PORTREVISION= 1
CATEGORIES= french science
MAINTAINER= thierry@FreeBSD.org
@@ -16,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS_DEFINE= DOCS EXAMPLES
-USES= fortran gmake libtool tk
+USES= fortran gmake libtool:keepla tk
CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE}
CONFIGURE_ENV= WISH=${WISH}
GNU_CONFIGURE= yes
diff --git a/ftp/gstreamer1-plugins-curl/Makefile b/ftp/gstreamer1-plugins-curl/Makefile
index 437f289f3bfa..48320a8246f8 100644
--- a/ftp/gstreamer1-plugins-curl/Makefile
+++ b/ftp/gstreamer1-plugins-curl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= ftp
COMMENT= Gstreamer curl plugin
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index 48e23d9f1d93..d7be68dcd45c 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ggz-client-libs
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index 213db5d66825..ecd48757590c 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ggz-gtk-client
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index cc3255c1e8bc..2294e5516ab0 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libggz
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 31b260fcb286..c40a4795d780 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pinball
PORTVERSION= 0.3.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -12,7 +12,7 @@ COMMENT= Emilia Pinball is a free pinball game
LICENSE= GPLv2
-USES= gmake libtool
+USES= gmake libtool:keepla
USE_GL= gl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 28311e42cd09..c04d5f0f9233 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenEXR
PORTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= SAVANNAH/openexr/
DISTNAME= openexr-${DISTVERSION}
@@ -17,7 +17,7 @@ LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase
WRKSRC= ${WRKDIR}/${DISTNAME}
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples
USE_LDCONFIG= yes
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 9942c3cfefa8..de7898ccd8e7 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aalib
PORTVERSION= 1.4.r5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/aa-project/aa-lib/1.4rc5
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= X11
-USES= ncurses libtool
+USES= libtool:keepla ncurses
WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index accb3e472c1d..bdf8205ee34d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= cairo
PORTVERSION= 1.10.2
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH?= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
--enable-tee
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_XORG= pixman
USE_GNOME= referencehack
USE_LDCONFIG= yes
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 73a10c6f8090..c2242e4ba2ba 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= cairomm
PORTVERSION= 1.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= cairo libxml++26
CONFIGURE_ENV= AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index edcfe5a607f3..08be23d5210a 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= clutter-box2d
PORTVERSION= 0.10.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/0.10/
@@ -12,7 +12,7 @@ COMMENT= Clutter Box2D integration library
LIB_DEPENDS= libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gnomeprefix
USE_GL= gl
USE_XORG= xp x11
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index f56f24b08bcf..07f767daa363 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= clutter-gtk
PORTVERSION= 0.10.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -14,7 +14,7 @@ LIB_DEPENDS= libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
USE_BZIP2= yes
USE_GL= gl
-USES= gettext libtool pathfix gmake pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GNOME= gtk20 gnomeprefix
USE_XORG= xp x11
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index c202f2c29ed7..37e1c812441f 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -4,7 +4,7 @@
PORTNAME= clutter
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= GNOME \
http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
@@ -16,7 +16,7 @@ LIB_DEPENDS= libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
LICENSE= LGPL21
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gdkpixbuf2 gnomeprefix atk pango introspection:build
INSTALL_TARGET= install-strip
USE_GL= gl
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 065baae76d44..4319210a68d0 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dia
DISTVERSION= 0.97.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
@@ -18,7 +18,8 @@ OPTIONS_DEFINE= DOCS
LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \
libpng15.so:${PORTSDIR}/graphics/png
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig tar:xz
USE_GNOME= gtk20 gnomeprefix libxslt libartlgpl2 intlhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 38c55aec5876..629c76772321 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -4,7 +4,7 @@
PORTNAME= eog-plugins
PORTVERSION= 2.30.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,9 +16,9 @@ BUILD_DEPENDS= eog:${PORTSDIR}/graphics/eog
LIB_DEPENDS= libgdata.so:${PORTSDIR}/devel/libgdata
RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GL= gl
USE_GNOME= gnomeprefix intlhack gtk20
-USES= gettext pathfix libtool gmake pkgconfig tar:bzip2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 1a0dfb7d4bbb..90f7ac58acc8 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -4,7 +4,7 @@
PORTNAME= eog
PORTVERSION= 2.32.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,10 +15,11 @@ COMMENT= The Eye Of Gnome image viewer
BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack librsvg2 gconf2 gnomedesktop
WANT_GNOME= yes
INSTALLS_ICONS= yes
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:bzip2
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index eed1a4a3714e..b0fdf38b17c2 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evince
PORTVERSION= 2.32.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,7 +25,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
-USES= desktop-file-utils gettext pathfix gmake pkgconfig libtool tar:bzip2
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig tar:bzip2
USE_GNOME= intlhack gnomeprefix gnomedocutils gconf2
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 34817354663a..20ca35e47d51 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exiv2
PORTVERSION= 0.24
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.exiv2.org/
@@ -14,8 +15,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
-USES= gettext gmake iconv libtool
GNU_CONFIGURE= yes
+USES= gettext gmake iconv libtool:keepla
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index ea64b0ff65d8..bdf28110fe18 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freeglut
PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
@@ -14,7 +14,7 @@ LICENSE= MIT
CONFLICTS= libglut-[0-9].*
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_XORG= ice xi xxf86vm xrandr
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index ba3f2dbaf12f..8753e9302613 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gegl
PORTVERSION= 0.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.2/
@@ -21,7 +21,7 @@ ENSCRIPT_DESC= Enscript support
SPIRO_DESC= Spiro support
#UMFPACK_DESC= UMFpack support
-USES= gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
USE_GNOME= glib20 intltool
USE_LDCONFIG= ${PREFIX}/lib/gegl-0.2
GNU_CONFIGURE= yes
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 082572530a1b..2edfe363a613 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -4,16 +4,16 @@
PORTNAME= glitz
PORTVERSION= 0.5.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL image compositing library
+USES= libtool:keepla pathfix
USE_GL= yes
USE_XORG= xt
-USES= pathfix libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 7163b39eee85..96ec3cb68d19 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -4,7 +4,7 @@
PORTNAME= goocanvas
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -13,7 +13,7 @@ COMMENT= Canvas widget for GTK+
PORTSCOUT= ignore:1
-USES= libtool pathfix pkgconfig tar:bzip2
+USES= libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index 825fd5794761..be39ddcc233c 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= goocanvasmm
PORTVERSION= 0.15.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
PORTSCOUT= ignore:1
-USES= libtool gmake pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gtkmm24
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile
index 859583a7da9c..6d79ca3bd5a1 100644
--- a/graphics/goocanvasmm2/Makefile
+++ b/graphics/goocanvasmm2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= goocanvasmm
PORTVERSION= 1.90.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
@@ -14,7 +14,7 @@ COMMENT= C++ bindings for the goocanvas widget for GTK
LIB_DEPENDS= libgoocanvas-2.0.so:${PORTSDIR}/graphics/goocanvas2
-USES= libtool gmake pathfix pkgconfig tar:xz
+USES= gmake libtool:keepla pathfix pkgconfig tar:xz
USE_GNOME= gtkmm30
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/gstreamer1-plugins-aalib/Makefile b/graphics/gstreamer1-plugins-aalib/Makefile
index e997dd6bbbd2..ee00144b836f 100644
--- a/graphics/gstreamer1-plugins-aalib/Makefile
+++ b/graphics/gstreamer1-plugins-aalib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer ASCII art plugin
diff --git a/graphics/gstreamer1-plugins-cairo/Makefile b/graphics/gstreamer1-plugins-cairo/Makefile
index 9fd5a125d029..8811d3d4b8b7 100644
--- a/graphics/gstreamer1-plugins-cairo/Makefile
+++ b/graphics/gstreamer1-plugins-cairo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer vector graphics plugin
diff --git a/graphics/gstreamer1-plugins-gdkpixbuf/Makefile b/graphics/gstreamer1-plugins-gdkpixbuf/Makefile
index db433bc32bc8..9f172606f90e 100644
--- a/graphics/gstreamer1-plugins-gdkpixbuf/Makefile
+++ b/graphics/gstreamer1-plugins-gdkpixbuf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMESUFFIX= 1-plugins-gdkpixbuf
diff --git a/graphics/gstreamer1-plugins-jpeg/Makefile b/graphics/gstreamer1-plugins-jpeg/Makefile
index 96a1fc8b912e..fd9d7a0bcba6 100644
--- a/graphics/gstreamer1-plugins-jpeg/Makefile
+++ b/graphics/gstreamer1-plugins-jpeg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer jpeg encoder/decoder plugin
diff --git a/graphics/gstreamer1-plugins-libcaca/Makefile b/graphics/gstreamer1-plugins-libcaca/Makefile
index 779a0e869f5d..46650ed9624c 100644
--- a/graphics/gstreamer1-plugins-libcaca/Makefile
+++ b/graphics/gstreamer1-plugins-libcaca/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer color ASCII art plugin
diff --git a/graphics/gstreamer1-plugins-libvisual/Makefile b/graphics/gstreamer1-plugins-libvisual/Makefile
index 27fce809821c..17ea9c4b428d 100644
--- a/graphics/gstreamer1-plugins-libvisual/Makefile
+++ b/graphics/gstreamer1-plugins-libvisual/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer libvisual plugin
diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile
index 6887f7bfc3d0..9cb4c45a27fd 100644
--- a/graphics/gstreamer1-plugins-opencv/Makefile
+++ b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer opencv real time computer vision plugin
diff --git a/graphics/gstreamer1-plugins-openjpeg/Makefile b/graphics/gstreamer1-plugins-openjpeg/Makefile
index fca954293d0a..952c66542e33 100644
--- a/graphics/gstreamer1-plugins-openjpeg/Makefile
+++ b/graphics/gstreamer1-plugins-openjpeg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer jpeg2000 decoder plugin
diff --git a/graphics/gstreamer1-plugins-png/Makefile b/graphics/gstreamer1-plugins-png/Makefile
index 668a1f8aabb8..d7d8e262523a 100644
--- a/graphics/gstreamer1-plugins-png/Makefile
+++ b/graphics/gstreamer1-plugins-png/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMESUFFIX= 1-plugins-png
diff --git a/graphics/gstreamer1-plugins-webp/Makefile b/graphics/gstreamer1-plugins-webp/Makefile
index 56a61a2bd385..3d0a5bd84103 100644
--- a/graphics/gstreamer1-plugins-webp/Makefile
+++ b/graphics/gstreamer1-plugins-webp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer webp image decoder plugin
diff --git a/graphics/gstreamer1-plugins-zbar/Makefile b/graphics/gstreamer1-plugins-zbar/Makefile
index 59da68f189f5..46bd5f425199 100644
--- a/graphics/gstreamer1-plugins-zbar/Makefile
+++ b/graphics/gstreamer1-plugins-zbar/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer ZBar barcode detector plugin
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 1aee776aa3d7..a9d9f8535a9c 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lcms
PORTVERSION= 1.19
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
@@ -24,7 +24,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
PORTDOCS= *
diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index b5b3242e38ca..137dbdeee890 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lcms2
PORTVERSION= 2.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/lcms/lcms/${PORTVERSION} \
http://www.littlecms.com/
@@ -22,7 +23,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
PORTDOCS= *
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index fedd2c29b881..7debe176ea86 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -3,14 +3,14 @@
PORTNAME= libcaca
DISTVERSION= 0.99.beta18
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Graphics library that outputs text instead of pixels
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-doc \
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 3445321c911f..9809f66dbbfe 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libchamplain
PORTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -16,7 +16,7 @@ LIB_DEPENDS= libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \
libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix gtk20
USE_SQLITE= 3
USE_GL= gl
diff --git a/graphics/libetonyek/Makefile b/graphics/libetonyek/Makefile
index edc5c39230f5..323baab1878f 100644
--- a/graphics/libetonyek/Makefile
+++ b/graphics/libetonyek/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libetonyek
PORTVERSION= 0.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://dev-www.libreoffice.org/src/
@@ -22,10 +22,10 @@ OPTIONS_DEFINE= DOCS TEST
CONFIGURE_ARGS= --disable-werror
CPPFLAGS+= -I${LOCALBASE}/include
-USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+USES= gmake libtool:keepla pathfix pkgconfig
+USE_LDCONFIG= yes
USE_XZ= yes
-USES= gmake libtool pkgconfig pathfix
PORTDOCS= *
DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 145e1c21f041..f5d6b163116d 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libexif
PORTVERSION= 0.6.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
@@ -14,7 +14,7 @@ LICENSE= LGPL21
OPTIONS_DEFINE= DOCS NLS
-USES= libtool gmake pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_BZIP2= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index f8281b7eb2ea..daaf7f796e10 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -4,19 +4,19 @@
PORTNAME= libgnomecanvas
PORTVERSION= 2.30.3
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A graphics library for GNOME
+COMMENT= Graphics library for GNOME
USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= libglade2 libartlgpl2 referencehack
GNU_CONFIGURE= yes
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index dc75ecffee3b..645258fe96cc 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomecanvasmm
PORTVERSION= 2.26.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libgnomecanvasmm26
-USES= gmake pathfix libtool pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= libgnomecanvas
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 51ff49267ebd..1005d71e15ee 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libopenraw
PORTVERSION= 0.0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://libopenraw.freedesktop.org/download/
@@ -13,7 +13,7 @@ COMMENT= Library for camera RAW files decoding
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libjpeg.so:${PORTSDIR}/graphics/jpeg
-USES= compiler:c++11-lang libtool pkgconfig tar:bzip2
+USES= compiler:c++11-lang libtool:keepla pkgconfig tar:bzip2
USE_GNOME= libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index 48705d60bf24..662b9e86afa4 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libwpg
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE_COMB= dual
LIB_DEPENDS= libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
-USES= libtool pkgconfig perl5 pathfix
+USES= libtool:keepla pathfix perl5 pkgconfig
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile
index f77c0fb5c40c..b8586c9cb853 100644
--- a/graphics/poppler-glib/Makefile
+++ b/graphics/poppler-glib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -glib
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index 27ffd9a56b50..c50e1f71863c 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -qt4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index fe9540f610dc..ec92217ce9fa 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -utils
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 08bda7bf7adf..6e2085c94f95 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -4,7 +4,7 @@
PORTNAME= poppler
PORTVERSION= 0.24.5
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
USE_XZ= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 3d98fae2dd86..d4e5febc7dc6 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES?= japanese
MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/FreeWnn-lib/Makefile.common b/japanese/FreeWnn-lib/Makefile.common
index 1c50f314b340..d4930c77b033 100644
--- a/japanese/FreeWnn-lib/Makefile.common
+++ b/japanese/FreeWnn-lib/Makefile.common
@@ -1,7 +1,7 @@
# $FreeBSD$
GNU_CONFIGURE= yes
-USES= libtool
+USES= libtool:keepla
USE_AUTOTOOLS= aclocal autoheader autoconf libtoolize
LIBTOOLIZE_ARGS=-i -c -f
USE_BZIP2= yes
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index f31021555380..4e6861683d93 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES?= japanese
MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 02d473695cc6..51353aad85cb 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kakasi
PORTVERSION= 2.3.5
+PORTREVISION= 1
CATEGORIES= japanese textproc
MASTER_SITES= http://kakasi.namazu.org/stable/
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 17ab7460c983..26829de2311f 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gjs
PORTVERSION= 1.34.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -17,7 +17,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
CONFLICTS_BUILD=spidermonkey17-1.7.*
-USES= gettext gmake libtool pathfix pkgconfig shebangfix tar:xz
+USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:xz
USE_PYTHON_BUILD=2
USE_GNOME= cairo glib20 gnomeprefix introspection:build intlhack
USE_LDCONFIG= yes
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 0b08f28f8bb0..088cc2521f25 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -4,6 +4,7 @@
PORTNAME= vala
PORTVERSION= 0.20.1
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
@@ -12,7 +13,7 @@ COMMENT= Programming language and compiler that converts Vala code into C code
LICENSE= LGPL21
-USES= bison gettext gmake libtool pathfix pkgconfig
+USES= bison gettext gmake libtool:keepla pathfix pkgconfig
USE_XZ= yes
USE_GNOME= glib20 gnomeprefix libxslt introspection:build
GNU_CONFIGURE= yes
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index a5b9d55552d5..ef558eda0fdf 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution-exchange
PORTVERSION= 2.32.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
CONFLICTS= evolution-exchange-3.[0-9]*
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_BDB= 41+
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b2a87d885a4d..30e564ef583a 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution
PORTVERSION= 2.32.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,8 +19,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORT
CONFLICTS= evolution-3.[0-9]*
-USES= bison desktop-file-utils gettext pathfix gmake libtool pkgconfig tar:bzip2 \
- perl5
+USES= bison desktop-file-utils gettext gmake libtool:keepla pathfix \
+ perl5 pkgconfig tar:bzip2
USE_PERL5= run
USE_GNOME= gnomeprefix intlhack evolutiondataserver gtkhtml3 \
gnomedocutils gnomedesktop
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 2a2170d611c2..c637089ddb9e 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fftw
PORTVERSION= 2.1.5
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
ftp://ftp.fftw.org/pub/fftw/old/ \
@@ -22,7 +22,7 @@ FFTW_FLAVOR?= default
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
-USES= fortran gmake libtool
+USES= fortran gmake libtool:keepla
USE_LDCONFIG= yes
BROKEN_sparc64= does not build
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 3ab693381139..07092454effb 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fityk
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF/xylib:xylib
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:${PORT
gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
-USES= gmake libtool tar:bzip2 desktop-file-utils shared-mime-info
+USES= desktop-file-utils gmake libtool:keepla shared-mime-info tar:bzip2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
LDFLAGS+= -lbz2 -lz
USE_GITHUB= yes
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index cd2858fee8e3..8b7663f152f3 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -3,7 +3,7 @@
PORTNAME= giacxcas
PORTVERSION= 1.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \
http://www.math.jussieu.fr/~han/xcas/sources/
@@ -28,11 +28,11 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \
NO_CDROM= French documentation is for non-commercial use only
GNU_CONFIGURE= yes
+USES= desktop-file-utils gettext gmake libtool:keepla shebangfix
USE_GL= gl
-USE_XORG= xcursor xft xi
+USE_XORG= x11 xcursor xft xi
USE_TEX= latex:build dvipsk:build
USE_LDCONFIG= yes
-USES= gettext gmake shebangfix desktop-file-utils
USE_GCC= yes
DOCSDIR= ${PREFIX}/share/doc/giac
PORTDOCS= *
@@ -40,6 +40,7 @@ DATADIR= ${PREFIX}/share/giac
PORTDATA= *
SHEBANG_FILES= src/pgiac
+CONFIGURE_ENV= X_LIBS=-lX11
CPPFLAGS+= -I${FLTKDEV-GIAC} -I${COCOALIB-GIAC}/include -I${LOCALBASE}/include
LDFLAGS+= -L${FLTKDEV-GIAC}/lib -L${COCOALIB-GIAC}/lib -L${LOCALBASE}/lib
CXXFLAGS+= -I${LOCALBASE}/include
@@ -50,7 +51,8 @@ COCOALIB-GIAC= ${WRKDIR}/CoCoALib-0.9950
INFO= giac_es giac_us
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
.if ${OSVERSION} >= 1000000
CONFIGURE_ARGS+= --disable-ntl
.endif
@@ -73,4 +75,4 @@ pre-configure:
./configure --prefix=${FLTKDEV-GIAC} \
&& ${MAKE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 945a84047ebb..88f398521d09 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gmp
PORTVERSION= 5.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gmp
@@ -16,8 +16,8 @@ LICENSE= LGPL3
OPTIONS_DEFINE= CPU_OPTS
CPU_OPTS_DESC= Enable assembly optimizations for your CPU
+USES= libtool:keepla
USE_XZ= yes
-USES= libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/math/matio/Makefile b/math/matio/Makefile
index 0f101cced1b6..a84a543d9c74 100644
--- a/math/matio/Makefile
+++ b/math/matio/Makefile
@@ -3,6 +3,7 @@
PORTNAME= matio
PORTVERSION= 1.5.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF
@@ -12,7 +13,7 @@ COMMENT= Library for reading and writing Matlab MAT files
LICENSE= BSD2CLAUSE
GNU_CONFIGURE= yes
-USES= libtool pathfix
+USES= libtool:keepla pathfix
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index 9461b0a4773c..bec1561bbf38 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mpfr
PORTVERSION= 3.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math devel
MASTER_SITES= http://www.mpfr.org/mpfr-current/
DIST_SUBDIR= ${DISTNAME}
@@ -23,8 +23,7 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
#PATCHFILES!= /usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
#PATCH= ${LOCALBASE}/bin/gpatch
-USES= libtool
-
+USES= libtool:keepla
USE_XZ= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gmp=${LOCALBASE}
diff --git a/misc/libisocodes/Makefile b/misc/libisocodes/Makefile
index e9c8bbe347ec..df79f6dfc9c7 100644
--- a/misc/libisocodes/Makefile
+++ b/misc/libisocodes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libisocodes
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://pkg-isocodes.alioth.debian.org/downloads/
@@ -16,10 +16,9 @@ BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
LIB_DEPENDS= libgee.so:${PORTSDIR}/devel/libgee06
RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes
-USE_XZ= yes
-USES= gettext gmake libtool pathfix pkgconfig
-USE_GNOME= glib20 gnomehier introspection:build libxml2
GNU_CONFIGURE= yes
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USE_GNOME= glib20 gnomehier introspection:build libxml2
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/xml/|${LOCALBASE}/share/xml/|g' \
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index c6f8b503dd00..444d5449c456 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -3,14 +3,14 @@
PORTNAME= xdelta
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= eadler@FreeBSD.org
COMMENT= Diff/patch utility for binary files
-USES= pkgconfig libtool
+USES= libtool:keepla pkgconfig
USE_GNOME= glib20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 7d493438a464..f9a5b485c456 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -4,22 +4,22 @@
PORTNAME= cheese
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam
+COMMENT= Photobooth-inspired app for taking pictures and videos from webcam
BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS= libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
libhal.so:${PORTSDIR}/sysutils/hal
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= xxf86vm
USE_GNOME= gnomeprefix intlhack evolutiondataserver librsvg2 \
gnomedocutils gnomedesktop
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
USE_GSTREAMER= gconf good ogg theora v4l2 vorbis
INSTALLS_OMF= yes
INSTALL_TARGET= install-strip
diff --git a/multimedia/gstreamer1-plugins-assrender/Makefile b/multimedia/gstreamer1-plugins-assrender/Makefile
index 86ab0ad29761..db0db7c1e3e1 100644
--- a/multimedia/gstreamer1-plugins-assrender/Makefile
+++ b/multimedia/gstreamer1-plugins-assrender/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer ASS/SSA text renderer plugin
diff --git a/multimedia/gstreamer1-plugins-bad/Makefile b/multimedia/gstreamer1-plugins-bad/Makefile
index d5b6514b84b6..82cb666ebdfb 100644
--- a/multimedia/gstreamer1-plugins-bad/Makefile
+++ b/multimedia/gstreamer1-plugins-bad/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/multimedia/gstreamer1-plugins-bad/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Bad gstreamer-plugins
diff --git a/multimedia/gstreamer1-plugins-dts/Makefile b/multimedia/gstreamer1-plugins-dts/Makefile
index db1d89f16a0b..ae39b1a4b5cd 100644
--- a/multimedia/gstreamer1-plugins-dts/Makefile
+++ b/multimedia/gstreamer1-plugins-dts/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer dts plugin
diff --git a/multimedia/gstreamer1-plugins-dv/Makefile b/multimedia/gstreamer1-plugins-dv/Makefile
index 20af99fb7309..5def433d9e05 100644
--- a/multimedia/gstreamer1-plugins-dv/Makefile
+++ b/multimedia/gstreamer1-plugins-dv/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMESUFFIX= 1-plugins-dv
diff --git a/multimedia/gstreamer1-plugins-dvdread/Makefile b/multimedia/gstreamer1-plugins-dvdread/Makefile
index ca439dffa2ce..81641fcfa015 100644
--- a/multimedia/gstreamer1-plugins-dvdread/Makefile
+++ b/multimedia/gstreamer1-plugins-dvdread/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer dvdread plugin
diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile
index fb00a9188416..60a5b98ff15c 100644
--- a/multimedia/gstreamer1-plugins-good/Makefile
+++ b/multimedia/gstreamer1-plugins-good/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/multimedia/gstreamer1-plugins-good/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Good gstreamer-plugins
diff --git a/multimedia/gstreamer1-plugins-kate/Makefile b/multimedia/gstreamer1-plugins-kate/Makefile
index 3a7a848b15fa..5cc2d15993ce 100644
--- a/multimedia/gstreamer1-plugins-kate/Makefile
+++ b/multimedia/gstreamer1-plugins-kate/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer kate codec plugin
diff --git a/multimedia/gstreamer1-plugins-mpeg2dec/Makefile b/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
index b0190dc9a4b0..6a3d4d96bf9d 100644
--- a/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
+++ b/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer mpeg decode plugin
diff --git a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
index ef5d5e6b98e6..d3cba8558b87 100644
--- a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer1-plugins-resindvd/Makefile b/multimedia/gstreamer1-plugins-resindvd/Makefile
index c40882dc955e..72e1dd526171 100644
--- a/multimedia/gstreamer1-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer1-plugins-resindvd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer resindvd plugin
diff --git a/multimedia/gstreamer1-plugins-rtmp/Makefile b/multimedia/gstreamer1-plugins-rtmp/Makefile
index bcffa9864852..2c3cf6ecd6d4 100644
--- a/multimedia/gstreamer1-plugins-rtmp/Makefile
+++ b/multimedia/gstreamer1-plugins-rtmp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer rtmp plugin
diff --git a/multimedia/gstreamer1-plugins-schroedinger/Makefile b/multimedia/gstreamer1-plugins-schroedinger/Makefile
index fd71d23b8256..383e7939b82c 100644
--- a/multimedia/gstreamer1-plugins-schroedinger/Makefile
+++ b/multimedia/gstreamer1-plugins-schroedinger/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMESUFFIX= 1-plugins-schroedinger
diff --git a/multimedia/gstreamer1-plugins-theora/Makefile b/multimedia/gstreamer1-plugins-theora/Makefile
index ba9b21525d56..e0b31ba7fca6 100644
--- a/multimedia/gstreamer1-plugins-theora/Makefile
+++ b/multimedia/gstreamer1-plugins-theora/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer theora plugin
diff --git a/multimedia/gstreamer1-plugins-ugly/Makefile b/multimedia/gstreamer1-plugins-ugly/Makefile
index 4387d8ae4bf8..91a56273b240 100644
--- a/multimedia/gstreamer1-plugins-ugly/Makefile
+++ b/multimedia/gstreamer1-plugins-ugly/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/multimedia/gstreamer1-plugins-ugly/Makefile,v 1.3 2013/01/15 21:43:46 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Ugly gstreamer-plugins
diff --git a/multimedia/gstreamer1-plugins-v4l2/Makefile b/multimedia/gstreamer1-plugins-v4l2/Makefile
index b0a3d7486e40..9d31f44feb2f 100644
--- a/multimedia/gstreamer1-plugins-v4l2/Makefile
+++ b/multimedia/gstreamer1-plugins-v4l2/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMESUFFIX= 1-plugins-v4l2
diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile
index 379ee383b963..626be2af522f 100644
--- a/multimedia/gstreamer1-plugins-vpx/Makefile
+++ b/multimedia/gstreamer1-plugins-vpx/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer vp8 codec plugin
diff --git a/multimedia/gstreamer1-plugins-x264/Makefile b/multimedia/gstreamer1-plugins-x264/Makefile
index 66ac4f231644..bbdf10e0afcc 100644
--- a/multimedia/gstreamer1-plugins-x264/Makefile
+++ b/multimedia/gstreamer1-plugins-x264/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index d60ef6180eff..87f51ca78fbe 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}.
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
@@ -41,7 +41,7 @@ UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?= base
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
WANT_GSTREAMER= yes
USE_XZ= yes
USE_GNOME+= glib20 gnomehier introspection:build libxml2
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 6caa1f921c29..8b4d9acafdc3 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gstreamer1
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/
DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION}
@@ -17,7 +17,7 @@ LICENSE= LGPL20
PORTSCOUT= limitw:1,even
CFLAGS:= ${CFLAGS} -O2 -Wno-format
-USES= bison gettext gmake libtool pathfix pkgconfig tar:xz
+USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:xz
USE_GNOME= glib20 gnomehier introspection:build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tests \
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 6c13cbd78875..a11d86fb1410 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gxine
PORTVERSION= 0.5.907
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION}
@@ -19,10 +19,9 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \
OPTIONS_DEFINE= MOZILLA_PLUGIN GNOME LIRC
MOZILLA_PLUGIN_DESC= Mozilla plugin
-USES= gmake libtool pathfix pkgconfig tar:xz
+USES= gmake libtool:keepla pathfix pkgconfig tar:xz
USE_GNOME= gtk20
-USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= MKDIR_P="${MKDIR}"
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-hal --with-libintl-prefix=${LOCALBASE}
INSTALLS_ICONS= yes
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 34d33fe1ae4f..3ac2e0bc0d5e 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -3,14 +3,14 @@
PORTNAME= libmpeg2
PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= http://libmpeg2.sourceforge.net/files/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Free library for decoding MPEG-2 and MPEG-1 video streams
-USES= libtool pathfix
+USES= libtool:keepla pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 3dabc9bb7969..cfe016173fe5 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libtheora
PORTVERSION= 1.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xiph.org/releases/theora/ \
http://distfiles.master.finkmirrors.net/
@@ -13,8 +13,8 @@ COMMENT= Theora video codec for the Ogg multimedia streaming system
LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
-USES= libtool
GNU_CONFIGURE= yes
+USES= libtool:keepla
USE_BZIP2= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS="${PTHEAD_LIBS}"
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 055b08830b6e..c1c62fa41fc5 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -4,7 +4,7 @@
PORTNAME= totem-pl-parser
PORTVERSION= 2.32.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ LIB_DEPENDS= libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-USES= pathfix gettext pkgconfig gmake libtool tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix glib20 libxml2 intlhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 062628efbfd1..4f7b50421c91 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -4,7 +4,7 @@
PORTNAME= totem
PORTVERSION= 2.32.0
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,11 +24,10 @@ CONFLICTS= totem-3.[0-9]*
GNU_CONFIGURE= yes
USE_PYTHON= yes
-USES= pathfix gettext gmake desktop-file-utils libtool pkgconfig tar:bzip2 \
- shebangfix
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shebangfix tar:bzip2
SHEBANG_FILES= data/totem-bugreport.py
-USE_GNOME= gnomeprefix intlhack nautilus2 \
- pygtk2 gnomehier
+USE_GNOME= gnomehier gnomeprefix intlhack nautilus2 pygtk2
USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 28461bf537a1..5ba020f3b0eb 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -4,12 +4,13 @@
PORTNAME= folks
PORTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= GNOME
+PKGNAMESUFFIX= 04
MAINTAINER= gnome@FreeBSD.org
-COMMENT= library to aggregates people from multiple sources
+COMMENT= Library to aggregate people from multiple sources
BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \
g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
@@ -18,9 +19,8 @@ LIB_DEPENDS= libgee.so:${PORTSDIR}/devel/libgee06 \
CONFLICTS= folks-0.[6-9].[0-9]*
-PKGNAMESUFFIX= 04
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
-USES= pathfix gettext gmake pkgconfig tar:bzip2 libtool
USE_GNOME= intlhack gnomehier
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 4e22cb2cbc18..a76b7f48f838 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gloox
PORTVERSION= 1.0.9
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://camaya.net/download/
@@ -14,8 +15,8 @@ LICENSE= GPLv3
LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \
libgnutls.so:${PORTSDIR}/security/gnutls
+USES= compiler:c++11-lang libtool:keepla pathfix pkgconfig
USE_BZIP2= yes
-USES= compiler:c++11-lang libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index b3809d0918d5..99c0f5a17a8c 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cflowd
PORTVERSION= 2.1.b1
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.caida.org/tools/measurement/cflowd/download/
@@ -15,7 +15,7 @@ COMMENT= Flow analysis tool used for analyzing Cisco's NetFlow switching
LIB_DEPENDS= Arts:${PORTSDIR}/net-mgmt/arts++
GNU_CONFIGURE= yes
-USES= bison gmake libtool
+USES= bison gmake libtool:keepla
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --with-artspp=${LOCALBASE}
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 6479d3b992d6..a5a01c04d394 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -4,6 +4,7 @@
PORTNAME= glib-networking
PORTVERSION= 2.36.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,8 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
GNU_CONFIGURE= yes
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
USE_GNOME= glib20 intltool
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/gstreamer1-plugins-libmms/Makefile b/net/gstreamer1-plugins-libmms/Makefile
index 219b688c921a..9d306482796d 100644
--- a/net/gstreamer1-plugins-libmms/Makefile
+++ b/net/gstreamer1-plugins-libmms/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
COMMENT= Gstreamer mms:// and mmsh:// plugin
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index 89e28887aade..d49f575db72b 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libmms
PORTVERSION= 0.6.3
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF
@@ -11,7 +12,7 @@ COMMENT= Library for parsing mms:// and mmsh:// type network streams
LICENSE= LGPL21
-USES= gettext libtool pathfix pkgconfig
+USES= gettext libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index d93cacc494bb..909e3e55498d 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libsocket++
PORTVERSION= 1.12.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://src.linuxhacker.at/socket++/
DISTNAME= socket++-${PORTVERSION}
@@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= libtool
+USES= libtool:keepla
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
AUTOMAKE_ARGS= -a -c
LIBTOOLIZE_ARGS=-i -c
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index f8d773628963..9866c37bae63 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mpich
DISTVERSION= 3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net parallel
MASTER_SITES= http://www.mpich.org/static/downloads/${DISTVERSION}/
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 7c80d8ac6421..33d3b49cf972 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -39,32 +39,26 @@ include/primitives/opa_nt_intrinsics.h
include/primitives/opa_sun_atomic_ops.h
include/primitives/opa_unsafe.h
%%FORTRAN%%lib/libfmpich.a
-%%FORTRAN%%lib/libfmpich.la
%%FORTRAN%%lib/libfmpich.so
%%FORTRAN%%lib/libfmpich.so.12
%%FORTRAN%%lib/libfmpich.so.12.0.0
lib/libmpich.a
-lib/libmpich.la
lib/libmpich.so
lib/libmpich.so.12
lib/libmpich.so.12.0.0
lib/libmpichcxx.a
-lib/libmpichcxx.la
lib/libmpichcxx.so
lib/libmpichcxx.so.12
lib/libmpichcxx.so.12.0.0
%%FORTRAN%%lib/libmpichf90.a
-%%FORTRAN%%lib/libmpichf90.la
%%FORTRAN%%lib/libmpichf90.so
%%FORTRAN%%lib/libmpichf90.so.12
%%FORTRAN%%lib/libmpichf90.so.12.0.0
lib/libmpl.a
-lib/libmpl.la
lib/libmpl.so
lib/libmpl.so.1
lib/libmpl.so.1.0.0
lib/libopa.a
-lib/libopa.la
lib/libopa.so
lib/libopa.so.1
lib/libopa.so.1.0.0
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index 8398b4c0b391..311e0fcd326d 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmlrpc-epi
PORTVERSION= 0.54.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-base/${PORTVERSION}/
@@ -14,7 +14,7 @@ LICENSE= MIT
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
-USES= gmake iconv libtool
+USES= gmake iconv libtool:keepla
USE_BZIP2= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 98e964afb1e2..90ddce5b7290 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -21,7 +21,7 @@ NO_CCACHE= yes
WITH_DEBUG= yes
CFLAGS+= -O0 -g
USE_LDCONFIG= yes
-USES= tar:xz libtool
+USES= libtool tar:xz
GNU_CONFIGURE= yes
# Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
@@ -92,7 +92,6 @@ PKG_BIN= ${WRKSRC}/src/pkg-static
.endif
post-install:
- @${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
@${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \
${STAGEDIR}${PREFIX}/lib/libpkg.a
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg.so.2
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 1573058b200d..7e90abe7eedb 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= freetype2
PORTVERSION= 2.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \
SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -18,8 +18,7 @@ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Free and portable TrueType font rendering engine
-USE_BZIP2= yes
-USES= gmake libtool
+USES= gmake libtool:keepla tar:bzip2
MAKE_ENV= TOP=""
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index b9ce6ebb35b1..effaa17223a1 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.14.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R}
@@ -24,8 +24,8 @@ PORTSCOUT= limitw:1,even
USE_XORG= x11
USE_GNOME= gnomedocutils gtk30 intlhack libgsf libxml2
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:xz
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 7a19fcdbb125..902a7371e03c 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hdf5
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science archivers graphics
MASTER_SITES= http://www.hdfgroup.org/ftp/HDF5/current/src/ \
ftp://ftp.hdfgroup.org/HDF5/current/src/ \
@@ -19,7 +19,7 @@ OPTIONS_DEFINE= DEBUG EXAMPLES FORTRAN SZIP
CONFLICTS_INSTALL= hdf-4.[0-9]* hdf5-1.6.[0-9]*
-USES= libtool tar:bzip2
+USES= libtool:keepla tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-cxx \
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 594fe64664db..19f9e1b9336f 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netcdf
PORTVERSION= 3.6.3
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES= science
MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
@@ -19,7 +19,7 @@ PORTSCOUT= limit:^3\.
CONFIGURE_ARGS= --enable-shared
CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC
GNU_CONFIGURE= yes
-USES= gmake libtool
+USES= gmake libtool:keepla
USE_LDCONFIG= yes
INFO= netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index e9220ef1cf3b..40acaead77f5 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ipsec-tools
PORTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= SF
@@ -23,7 +23,7 @@ USE_BZIP2= yes
INSTALL_TARGET= install-strip
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --sysconfdir=${PREFIX}/etc/racoon \
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index c9ecd3155671..2da7936a8bc2 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgcrypt
PORTVERSION= 1.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 09746f331688..29b16749e6c0 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libident
PORTVERSION= 0.32
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://www.remlab.net/files/libident/
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Small library to interface the ident protocol server (rfc1413)
OPTIONS_DEFINE= DOCS
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile
index 7fb38e947962..022de165ffa6 100644
--- a/security/libpwquality/Makefile
+++ b/security/libpwquality/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libpwquality
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/releases/l/i/libpwquality/
@@ -10,7 +11,7 @@ COMMENT= Library for generating random passwords and quality checking
LIB_DEPENDS= libcrack.so:${PORTSDIR}/security/cracklib
-USES= gettext gmake libtool pathfix
+USES= gettext gmake libtool:keepla pathfix
USE_BZIP2= yes
USE_GNOME= intltool
GNU_CONFIGURE= yes
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 9f2767648327..1338a2e22267 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libsecret
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
@@ -15,7 +16,7 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
USE_XZ= yes
USE_GNOME= gnomehier glib20 libxslt:build intltool introspection:build
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-introspection --disable-vala
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 79dd67ac102b..ee1b7ca4c23b 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opencdk
PORTVERSION= 0.6.6
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://josefsson.org/gnutls/releases/opencdk/
@@ -16,9 +16,9 @@ OPTIONS_DEFINE= DOCS
LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
-USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
+USE_BZIP2= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 198ef078af6f..71e10564f9c8 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= p11-kit
PORTVERSION= 0.20.2
+PORTREVISION= 1
CATEGORIES= security devel
MASTER_SITES= http://p11-glue.freedesktop.org/releases/
@@ -20,7 +21,7 @@ CONFIGURE_ARGS= --disable-nls --enable-debug=no \
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
MAKE_ENV= exampledir=${STAGEDIR}${EXAMPLESDIR}
-USES= gmake pkgconfig pathfix libtool
+USES= gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
pre-configure:
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index 8990b426c5a9..c8bf248458b8 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pam_mysql
PORTVERSION= 0.7.r1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security databases
MASTER_SITES= SF/pam-mysql/pam-mysql/0.7RC1
DISTNAME= ${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX}
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX}
MAINTAINER= anders@FreeBSD.org
COMMENT= Pam module for authenticating with MySQL
-USES= libtool
+USES= libtool:keepla
USE_MYSQL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --with-pam-mods-dir=${PREFIX}/lib --with-pam=/usr
diff --git a/security/pkcs11-helper/Makefile b/security/pkcs11-helper/Makefile
index 748d26ddab4c..ab3e7a1c79a4 100644
--- a/security/pkcs11-helper/Makefile
+++ b/security/pkcs11-helper/Makefile
@@ -3,12 +3,12 @@
PORTNAME= pkcs11-helper
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security devel
MASTER_SITES= SF/opensc/pkcs11-helper/
MAINTAINER= ale@FreeBSD.org
-COMMENT= A helper library for multiple PKCS\#11 providers
+COMMENT= Helper library for multiple PKCS\#11 providers
LICENSE= BSD3CLAUSE GPLv2
LICENSE_COMB= dual
@@ -18,7 +18,7 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPL
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USES= libtool pathfix pkgconfig tar:bzip2
+USES= libtool:keepla pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 92e1bf5490cb..65d5b249706a 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= encfs
PORTVERSION= 1.7.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= fusefs-
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \
--with-boost-filesystem=boost_filesystem
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USES= fuse gmake libtool pkgconfig
+USES= fuse gmake libtool:keepla pkgconfig
USE_LDCONFIG= yes
USE_OPENSSL= yes
diff --git a/sysutils/gstreamer1-plugins-cdio/Makefile b/sysutils/gstreamer1-plugins-cdio/Makefile
index e75f0104c61d..efd2f32faf3b 100644
--- a/sysutils/gstreamer1-plugins-cdio/Makefile
+++ b/sysutils/gstreamer1-plugins-cdio/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils
COMMENT= Gstreamer compact disc input and control library
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 7d46a0e7601c..73ef9135c289 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -4,7 +4,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -19,7 +19,7 @@ LIB_DEPENDS= libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
bash:${PORTSDIR}/shells/bash
-USES= pathfix gettext gmake libtool pkgconfig shebangfix
+USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix
USE_GNOME= intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 68c623315657..3569bda87027 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= policykit
PORTVERSION= 0.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
DISTNAME= PolicyKit-${PORTVERSION}
@@ -18,7 +18,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
USERS= polkit
GROUPS= polkit
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= glib20 intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 934e741b076d..91455d274beb 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= polkit
PORTVERSION= 0.105
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
@@ -15,7 +15,7 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus
USE_GNOME= glib20 intlhack gnomehier introspection
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 2b5b2f3fdc20..e806ae231208 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sleuthkit
PORTVERSION= 4.1.3
+PORTREVISION= 1
CATEGORIES= sysutils security
MASTER_SITES= SF
@@ -25,7 +26,7 @@ CONFLICTS= ja-ls-[0-9]* icat-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_PERL="${PERL}"
-USES= libtool perl5
+USES= libtool:keepla perl5
USE_LDCONFIG= yes
DATADIR= ${PREFIX}/share/tsk
diff --git a/textproc/gtkspell3/Makefile b/textproc/gtkspell3/Makefile
index 4a78242bd69c..a6f201fbfe6c 100644
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtkspell3
PORTVERSION= 3.0.4
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= SF/gtkspell/${PORTVERSION}
@@ -13,7 +14,7 @@ BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen
LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant
USE_GNOME= gnomehier gnomeprefix gtk30 intlhack introspection:build
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/libmwaw/Makefile b/textproc/libmwaw/Makefile
index d1570b610dc7..6cb933a03998 100644
--- a/textproc/libmwaw/Makefile
+++ b/textproc/libmwaw/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libmwaw
PORTVERSION= 0.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -20,8 +20,8 @@ CONFIGURE_ARGS= --disable-werror
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
+USES= compiler:features libtool:keepla pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-USES= libtool pkgconfig pathfix tar:xz compiler:features
PORTDOCS= *
DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
diff --git a/textproc/libodfgen/Makefile b/textproc/libodfgen/Makefile
index e2a5d7f990dc..94bce07a4979 100644
--- a/textproc/libodfgen/Makefile
+++ b/textproc/libodfgen/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libodfgen
PORTVERSION= 0.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -23,9 +23,9 @@ CONFIGURE_ARGS= --disable-werror
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
+USES= libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_XZ= yes
-USES= libtool pkgconfig pathfix
PORTDOCS= *
DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index c759754d1056..d31a882b6385 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libwps
PORTVERSION= 0.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS
CONFIGURE_ARGS= --disable-werror
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
-USES= libtool pkgconfig pathfix compiler:features
+USES= compiler:features libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
PORTDOCS= *
DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 2159c33e732f..07f771486d43 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libxml2
PORTVERSION= 2.8.0
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES?= textproc gnome
MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
http://xmlsoft.org/sources/ \
@@ -17,7 +17,7 @@ COMMENT?= XML parser library for GNOME
.if !defined(REFERENCE_PORT)
USE_CSTD= gnu89
GNU_CONFIGURE= yes
-USES= gmake iconv libtool pathfix pkgconfig
+USES= gmake iconv libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
--with-html-dir=${PREFIX}/share/doc \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 44ce97a012cb..83162d1f2b6e 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= raptor2
PORTVERSION= 2.0.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://download.librdf.org/source/ \
SF/librdf/${PORTNAME}/${PORTVERSION}
@@ -23,7 +23,7 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
CONFLICTS= raptor-1.4.1[0-9]* raptor-1.4.21
USE_GNOME= libxml2 libxslt
-USES= pathfix pkgconfig libtool
+USES= libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
--with-curl-config=${LOCALBASE}/bin/curl-config \
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 7db777151951..ad0982e7d8dd 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Sablot
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/sablotron/sablotron-${PORTVERSION}
@@ -33,7 +33,7 @@ DOM_CONFIGURE_ENABLE= dom
DOCUMENT_ERRORS_CONFIGURE_ENABLE= document-errors
GNU_CONFIGURE= yes
-USES= gmake iconv libtool
+USES= gmake iconv libtool:keepla
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lexpat ${ICONV_LIB}
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 41bc1021f8e2..c27dceab57c2 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scim-table-imengine
PORTVERSION= 0.5.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/scim/scim-tables/${PORTVERSION}
DISTNAME= scim-tables-${PORTVERSION}
@@ -15,7 +15,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim
GNU_CONFIGURE= yes
-USES= gettext gmake libtool pkgconfig
+USES= gettext gmake libtool:keepla pkgconfig
CONFIGURE_ARGS= --disable-skim-support
CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 651a2e0b4bd0..331f4013e680 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flickcurl
PORTVERSION= 1.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://download.dajobe.org/flickcurl/
@@ -23,7 +23,7 @@ RAPTOR_DESC= Use Raptor to serialize to triples
OFFLINE_DESC= Offline use of captured XML web service responses
CAPTURE_DESC= Capturing web service responses
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_GNOME= libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
diff --git a/www/gstreamer1-plugins-neon/Makefile b/www/gstreamer1-plugins-neon/Makefile
index dd3f19b0f5e0..b73438287705 100644
--- a/www/gstreamer1-plugins-neon/Makefile
+++ b/www/gstreamer1-plugins-neon/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www
COMMENT= Gstreamer neon http source plugin
diff --git a/www/libecap/Makefile b/www/libecap/Makefile
index 13636cd132ac..b78f113885ca 100644
--- a/www/libecap/Makefile
+++ b/www/libecap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libecap
PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www security
MASTER_SITES= http://www.measurement-factory.com/tmp/ecap/
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
OPTIONS_DEFINE= DOCS
-USES= libtool
+USES= libtool:keepla
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 1d867c9ffb07..8effadeba294 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= swfdec-plugin
PORTVERSION= 0.8.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
DISTNAME= swfdec-mozilla-${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT= Flash rendering plugin
LIB_DEPENDS= libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
-USES= pkgconfig webplugin:gecko libtool
+USES= libtool:keepla pkgconfig webplugin:gecko
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index bda9d5b8c815..a355a9f96cd2 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
index eb4b093f30e2..1374270cd522 100644
--- a/x11-drivers/xf86-input-acecad/pkg-plist
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/acecad_drv.la
lib/xorg/modules/input/acecad_drv.so
man/man4/acecad.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index 2d5bf585504e..f87176a0972e 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xf86-input-egalax
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= LOCAL/glebius
diff --git a/x11-drivers/xf86-input-egalax/pkg-plist b/x11-drivers/xf86-input-egalax/pkg-plist
index 6849aac7ac46..bd6166cf79d7 100644
--- a/x11-drivers/xf86-input-egalax/pkg-plist
+++ b/x11-drivers/xf86-input-egalax/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/egalax_drv.la
lib/xorg/modules/input/egalax_drv.so
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 50eb5511e396..8ac9aef2e873 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -14,10 +14,10 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
ELO_VERSION= 1.4.1
-ELO_REVISION= 0
+ELO_REVISION= 1
.else
ELO_VERSION= 1.2.4
-ELO_REVISION= 0
+ELO_REVISION= 1
.endif
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
index 04b774da2de4..743dc1bb411d 100644
--- a/x11-drivers/xf86-input-elographics/pkg-plist
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/elographics_drv.la
lib/xorg/modules/input/elographics_drv.so
man/man4/elographics.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 3857aa01074c..313086f960d4 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-fpit
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
index 9a8ba176754b..2d84806b8210 100644
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/fpit_drv.la
lib/xorg/modules/input/fpit_drv.so
share/X11/xorg.conf.d/50-fpit.conf
man/man4/fpit.4x.gz
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index ba6a1a37f438..c7325167f070 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -14,10 +14,10 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
HYPERVER= 1.4.1
-HYPERREVISION= 0
+HYPERREVISION= 1
.else
HYPERVER= 1.3.0
-HYPERREVISION= 6
+HYPERREVISION= 7
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
.endif
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
index 59dc01716933..ac8638a0057b 100644
--- a/x11-drivers/xf86-input-hyperpen/pkg-plist
+++ b/x11-drivers/xf86-input-hyperpen/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/hyperpen_drv.la
lib/xorg/modules/input/hyperpen_drv.so
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 372d0e436389..3ee62281110d 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -14,10 +14,10 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
JOYVER= 1.6.2
-JOYREVISION= 0
+JOYREVISION= 1
.else
JOYVER= 1.5.0
-JOYREVISION= 1
+JOYREVISION= 2
.endif
post-patch:
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index dba9b4c7ef03..f51b6910cd91 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -1,5 +1,4 @@
include/xorg/joystick-properties.h
-lib/xorg/modules/input/joystick_drv.la
lib/xorg/modules/input/joystick_drv.so
libdata/pkgconfig/xorg-joystick.pc
man/man4/joystick.4x.gz
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 3518e1752747..346ac4d17aaa 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-keyboard
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
index a2281aefc6f9..26a84c9a47a2 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/kbd_drv.la
lib/xorg/modules/input/kbd_drv.so
man/man4/kbd.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 4ef2b129dad3..a240996010da 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-magictouch
PORTVERSION= 1.0.0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -19,6 +19,5 @@ IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
.endif
XORG_CAT= driver
-USES= libtool
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
index 18cb36565da1..3a718e056dda 100644
--- a/x11-drivers/xf86-input-magictouch/pkg-plist
+++ b/x11-drivers/xf86-input-magictouch/pkg-plist
@@ -1,5 +1,4 @@
lib/xorg/modules/input/magictouch_drv.a
-lib/xorg/modules/input/magictouch_drv.la
lib/xorg/modules/input/magictouch_drv.so
man/man4/magictouch.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 4c28509c2c6b..7b697a7ba6ba 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-mouse
PORTVERSION= 1.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
index b871c54a7a66..1df1af7ff66d 100644
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -1,5 +1,4 @@
include/xorg/xf86-mouse-properties.h
-lib/xorg/modules/input/mouse_drv.la
lib/xorg/modules/input/mouse_drv.so
libdata/pkgconfig/xorg-mouse.pc
man/man4/mousedrv.4x.gz
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index aab8ea3f0a73..5a3fca4a240c 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-input-mutouch
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
index 595ac731d28a..d4311049f17d 100644
--- a/x11-drivers/xf86-input-mutouch/pkg-plist
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/mutouch_drv.la
lib/xorg/modules/input/mutouch_drv.so
man/man4/mutouch.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 9b7cbe39583c..f91263aa715d 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -14,10 +14,10 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
PEN_VERSION= 1.5.0
-PEN_REVISION= 0
+PEN_REVISION= 1
.else
PEN_VERSION= 1.4.1
-PEN_REVISION= 1
+PEN_REVISION= 2
.endif
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
index 46a7a8ac267d..154995f9ca20 100644
--- a/x11-drivers/xf86-input-penmount/pkg-plist
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/penmount_drv.la
lib/xorg/modules/input/penmount_drv.so
man/man4/penmount.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 5874922b4f8a..c8e32453989f 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -18,11 +18,11 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
SYNAPTICS_VERSION= 1.7.4
-SYNAPTICS_REVISION= 0
+SYNAPTICS_REVISION= 1
PLIST_SUB+= NEW="" OLD="@comment "
.else
SYNAPTICS_VERSION= 1.6.4
-SYNAPTICS_REVISION= 0
+SYNAPTICS_REVISION= 1
PLIST_SUB+= NEW="@comment " OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
.endif
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index d29caf256087..10ce5a3a27a0 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -2,7 +2,6 @@ bin/synclient
bin/syndaemon
include/xorg/synaptics-properties.h
%%OLD%%include/xorg/synaptics.h
-lib/xorg/modules/input/synaptics_drv.la
lib/xorg/modules/input/synaptics_drv.so
libdata/pkgconfig/xorg-synaptics.pc
man/man1/synclient.1.gz
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index d84420ad8379..90aca8440b08 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-input-vmmouse
PORTVERSION= 13.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 6d3a44183402..b9caa4664669 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -1,6 +1,5 @@
bin/vmmouse_detect
libexec/hal/scripts/hal-probe-vmmouse
-lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
man/man1/vmmouse_detect.1.gz
man/man4/vmmouse.4x.gz
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index b2bf5ef78add..6857f6146b59 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -14,10 +14,10 @@ XORG_CAT= driver
.if defined(WITH_NEW_XORG)
VOID_VERSION= 1.4.0
-VOID_REVISION= 0
+VOID_REVISION= 1
.else
VOID_VERSION= 1.3.1
-VOID_REVISION= 0
+VOID_REVISION= 1
.endif
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
index e63ae58bbc28..5ce860fd080d 100644
--- a/x11-drivers/xf86-input-void/pkg-plist
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/void_drv.la
lib/xorg/modules/input/void_drv.so
man/man4/void.4x.gz
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index e4a5bc41873e..e92a06cb4f5b 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-apm
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
index 3f8be66a23a4..de5ff78e429c 100644
--- a/x11-drivers/xf86-video-apm/pkg-plist
+++ b/x11-drivers/xf86-video-apm/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/apm_drv.la
lib/xorg/modules/drivers/apm_drv.so
man/man4/apm.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 1e9a526f6c30..38cf201c27b1 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-ark
PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
index ce3a4e949570..db7f65e4de81 100644
--- a/x11-drivers/xf86-video-ark/pkg-plist
+++ b/x11-drivers/xf86-video-ark/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/ark_drv.la
lib/xorg/modules/drivers/ark_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index be942d399d45..6bf515860539 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -16,12 +16,12 @@ USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
ATI_VERSION= 6.14.6
-ATI_REVISION= 2
+ATI_REVISION= 3
CONFIGURE_ARGS+=--disable-kms
PLIST_SUB+= OLD=""
.else
ATI_VERSION= 7.2.0
-ATI_REVISION= 2
+ATI_REVISION= 3
CONFIGURE_ARGS+=--disable-udev
CONFIGURE_ARGS+=--disable-glamor
EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index a244776f38d1..f64d9df88ad3 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -1,12 +1,7 @@
-lib/xorg/modules/drivers/ati_drv.la
lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
man/man4/ati.4x.gz
man/man4/radeon.4x.gz
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 4874a28863bf..90464281e798 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-chips
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
index 7204691323b3..0a6b95fbc89a 100644
--- a/x11-drivers/xf86-video-chips/pkg-plist
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/chips_drv.la
lib/xorg/modules/drivers/chips_drv.so
man/man4/chips.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 854ab4718a20..a2a0db68bf08 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
index b47e0b8d149b..386a9bbcb73a 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -1,8 +1,5 @@
-lib/xorg/modules/drivers/cirrus_alpine.la
lib/xorg/modules/drivers/cirrus_alpine.so
-lib/xorg/modules/drivers/cirrus_drv.la
lib/xorg/modules/drivers/cirrus_drv.so
-lib/xorg/modules/drivers/cirrus_laguna.la
lib/xorg/modules/drivers/cirrus_laguna.so
man/man4/cirrus.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 9ac0270fef4f..64f416a6972d 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
index 531bfe7b56a1..4bb76298e681 100644
--- a/x11-drivers/xf86-video-cyrix/pkg-plist
+++ b/x11-drivers/xf86-video-cyrix/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/cyrix_drv.la
lib/xorg/modules/drivers/cyrix_drv.so
man/man4/cyrix.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 7028fafe5e38..8430a1b23cea 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
index d9b858d452de..120c414e7ef0 100644
--- a/x11-drivers/xf86-video-dummy/pkg-plist
+++ b/x11-drivers/xf86-video-dummy/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/dummy_drv.la
lib/xorg/modules/drivers/dummy_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 6110bb766780..df4a14796ca9 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-fbdev
PORTVERSION= 0.4.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
index e99ec711f3b1..3ea8aa73913b 100644
--- a/x11-drivers/xf86-video-fbdev/pkg-plist
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/fbdev_drv.la
lib/xorg/modules/drivers/fbdev_drv.so
man/man4/fbdev.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index a4e70b1eff56..7ee494b48ad3 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-glint
PORTVERSION= 1.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
index 4943f96c01cd..06e0ad980d7a 100644
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/glint_drv.la
lib/xorg/modules/drivers/glint_drv.so
man/man4/glint.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index fdfcf2114ae9..8eb5f41cc2e9 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-i128
PORTVERSION= 1.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
index 8231266fd2b6..bf6f0d1d8360 100644
--- a/x11-drivers/xf86-video-i128/pkg-plist
+++ b/x11-drivers/xf86-video-i128/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/i128_drv.la
lib/xorg/modules/drivers/i128_drv.so
man/man4/i128.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index f80256232791..86b90974ccf6 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
index 6a6250b12f2a..34ff62b237bd 100644
--- a/x11-drivers/xf86-video-i740/pkg-plist
+++ b/x11-drivers/xf86-video-i740/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/i740_drv.la
lib/xorg/modules/drivers/i740_drv.so
man/man4/i740.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 5b343e12265b..afd712611072 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -27,7 +27,7 @@ USE_XORG= glproto \
.if defined(WITH_NEW_XORG)
INTEL_VERSION= 2.21.15
-INTEL_REVISION= 2
+INTEL_REVISION= 3
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
CONFIGURE_ARGS+= --disable-glamor
@@ -39,7 +39,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \
LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION= 2.7.1
-INTEL_REVISION= 7
+INTEL_REVISION= 8
PLIST_SUB+= OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index 948876757621..a7c967e55356 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -1,22 +1,14 @@
-lib/libI810XvMC.la
lib/libI810XvMC.so
lib/libI810XvMC.so.1
lib/libI810XvMC.so.1.0.0
-lib/libIntelXvMC.la
lib/libIntelXvMC.so.1
lib/libIntelXvMC.so
lib/libIntelXvMC.so.1.0.0
-%%OLD%%lib/xorg/modules/drivers/ch7017.la
%%OLD%%lib/xorg/modules/drivers/ch7017.so
-%%OLD%%lib/xorg/modules/drivers/ch7xxx.la
%%OLD%%lib/xorg/modules/drivers/ch7xxx.so
-lib/xorg/modules/drivers/intel_drv.la
lib/xorg/modules/drivers/intel_drv.so
-%%OLD%%lib/xorg/modules/drivers/ivch.la
%%OLD%%lib/xorg/modules/drivers/ivch.so
-%%OLD%%lib/xorg/modules/drivers/sil164.la
%%OLD%%lib/xorg/modules/drivers/sil164.so
-%%OLD%%lib/xorg/modules/drivers/tfp410.la
%%OLD%%lib/xorg/modules/drivers/tfp410.so
man/man4/intel.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 327c98796b87..38f8f0c747e7 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
index 32f0985ef3f9..8e47d690180e 100644
--- a/x11-drivers/xf86-video-mach64/pkg-plist
+++ b/x11-drivers/xf86-video-mach64/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/mach64_drv.la
lib/xorg/modules/drivers/mach64_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 48c872b7e7c4..028a1593b52d 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-mga
PORTVERSION= 1.6.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
index c8135fa96373..341b183eef1a 100644
--- a/x11-drivers/xf86-video-mga/pkg-plist
+++ b/x11-drivers/xf86-video-mga/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/mga_drv.la
lib/xorg/modules/drivers/mga_drv.so
man/man4/mga.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 2a86d787c41a..482f5b9eeffc 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
index b8fb593fa62a..b2949bc6941c 100644
--- a/x11-drivers/xf86-video-neomagic/pkg-plist
+++ b/x11-drivers/xf86-video-neomagic/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/neomagic_drv.la
lib/xorg/modules/drivers/neomagic_drv.so
man/man4/neomagic.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 60197b5a582d..1e50102c3b3a 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-newport
PORTVERSION= 0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
index 088860fca3da..4686d58e930b 100644
--- a/x11-drivers/xf86-video-newport/pkg-plist
+++ b/x11-drivers/xf86-video-newport/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/newport_drv.la
lib/xorg/modules/drivers/newport_drv.so
man/man4/newport.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 1bec3944ca77..f4fd932997f2 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
index f77c367a4212..780e08346435 100644
--- a/x11-drivers/xf86-video-nv/pkg-plist
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/nv_drv.la
lib/xorg/modules/drivers/nv_drv.so
man/man4/nv.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 0cb95f2ed4ed..b07c5186085b 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
index 8cfd05855e10..03b706985538 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -1,12 +1,9 @@
-lib/libchromeXvMC.la
lib/libchromeXvMC.so
lib/libchromeXvMC.so.1
lib/libchromeXvMC.so.1.0.0
-lib/libchromeXvMCPro.la
lib/libchromeXvMCPro.so
lib/libchromeXvMCPro.so.1
lib/libchromeXvMCPro.so.1.0.0
-lib/xorg/modules/drivers/openchrome_drv.la
lib/xorg/modules/drivers/openchrome_drv.so
man/man4/openchrome.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 53ad516a7f35..e6edd647e1dc 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist
index 9efb845952d1..a931d1fe828c 100644
--- a/x11-drivers/xf86-video-r128/pkg-plist
+++ b/x11-drivers/xf86-video-r128/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/r128_drv.la
lib/xorg/modules/drivers/r128_drv.so
man/man4/r128.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index eb4a887a5f5b..76589bd5cd51 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-video-rdc
PORTVERSION= 0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MASTER_SITES= http://www.SpringDaemons.com/stas/
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 18de975902e2..47d05544b2dd 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
index 59aa530f8505..04e6d8aaa4a7 100644
--- a/x11-drivers/xf86-video-rendition/pkg-plist
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/rendition_drv.la
lib/xorg/modules/drivers/rendition_drv.so
lib/xorg/modules/v10002d.uc
lib/xorg/modules/v20002d.uc
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 40867810c832..7abaf1502110 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-s3
PORTVERSION= 0.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
index 735f2aa01158..a6aa703ba991 100644
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ b/x11-drivers/xf86-video-s3/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/s3_drv.la
lib/xorg/modules/drivers/s3_drv.so
man/man4/s3.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 1f5e1136fbbf..02cf6b9e292d 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-s3virge
PORTVERSION= 1.10.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
index 85fbb681accf..b9b28e42531d 100644
--- a/x11-drivers/xf86-video-s3virge/pkg-plist
+++ b/x11-drivers/xf86-video-s3virge/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/s3virge_drv.la
lib/xorg/modules/drivers/s3virge_drv.so
man/man4/s3virge.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 7faa59529cbe..22ff9974afdb 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-savage
PORTVERSION= 2.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
index fab3aeb4cc8a..23de1c31fc80 100644
--- a/x11-drivers/xf86-video-savage/pkg-plist
+++ b/x11-drivers/xf86-video-savage/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/savage_drv.la
lib/xorg/modules/drivers/savage_drv.so
man/man4/savage.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile
index 65ef88a888c2..b5d7e3a5fe7a 100644
--- a/x11-drivers/xf86-video-scfb/Makefile
+++ b/x11-drivers/xf86-video-scfb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-video-scfb
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ \
LOCAL/rene
diff --git a/x11-drivers/xf86-video-scfb/pkg-plist b/x11-drivers/xf86-video-scfb/pkg-plist
index 5ada8ae7361d..7423c79910bf 100644
--- a/x11-drivers/xf86-video-scfb/pkg-plist
+++ b/x11-drivers/xf86-video-scfb/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/scfb_drv.la
lib/xorg/modules/drivers/scfb_drv.so
man/man4/scfb.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 66665ea8b072..3f992320f67c 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-siliconmotion
PORTVERSION= 1.7.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
index 7f27c3c38015..8471fb6e0b09 100644
--- a/x11-drivers/xf86-video-siliconmotion/pkg-plist
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/siliconmotion_drv.la
lib/xorg/modules/drivers/siliconmotion_drv.so
man/man4/siliconmotion.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 4f07b9e425fd..9fadf6ebe13e 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-video-sis-intel
PORTVERSION= 300407
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-drivers
MASTER_SITES= http://downloadmirror.intel.com/15443/eng/
DISTNAME= sis_drv_src_300407
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-plist b/x11-drivers/xf86-video-sis-intel/pkg-plist
index e1daba86088a..c4fda3a35443 100644
--- a/x11-drivers/xf86-video-sis-intel/pkg-plist
+++ b/x11-drivers/xf86-video-sis-intel/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sis_drv.la
lib/xorg/modules/drivers/sis_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 27adeeb6fa94..8d44f9d22312 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-sis
PORTVERSION= 0.10.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
index efcedbc0f6db..4563cbf4223a 100644
--- a/x11-drivers/xf86-video-sis/pkg-plist
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sis_drv.la
lib/xorg/modules/drivers/sis_drv.so
man/man4/sis.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 0504641a9ae7..14a9ce4abe33 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist
index 29c4cb560c60..8aa33693837c 100644
--- a/x11-drivers/xf86-video-sunffb/pkg-plist
+++ b/x11-drivers/xf86-video-sunffb/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sunffb_drv.la
lib/xorg/modules/drivers/sunffb_drv.so
man/man4/sunffb.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 7ac894d0ee45..e32260d26e51 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tdfx
PORTVERSION= 1.4.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
index fa4d8b44a61b..d104d44c3047 100644
--- a/x11-drivers/xf86-video-tdfx/pkg-plist
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tdfx_drv.la
lib/xorg/modules/drivers/tdfx_drv.so
man/man4/tdfx.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 2a33d01aa08a..75624fd7584c 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tga
PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist
index 342702c9fbab..41eacf6749f9 100644
--- a/x11-drivers/xf86-video-tga/pkg-plist
+++ b/x11-drivers/xf86-video-tga/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tga_drv.la
lib/xorg/modules/drivers/tga_drv.so
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index a6db3d6c9d8c..d06fd63cc791 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-trident
PORTVERSION= 1.3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
index f2b5b0de9faa..4f60a8fb760b 100644
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/trident_drv.la
lib/xorg/modules/drivers/trident_drv.so
man/man4/trident.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index c6afdadc9e36..54820509e1aa 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tseng
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
index 3eba34ace5b6..803640d8aedc 100644
--- a/x11-drivers/xf86-video-tseng/pkg-plist
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tseng_drv.la
lib/xorg/modules/drivers/tseng_drv.so
man/man4/tseng.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index b9785b8a7865..488fc1701e6f 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-vesa
PORTVERSION= 2.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
index 1091e20a3eeb..641d28f8041f 100644
--- a/x11-drivers/xf86-video-vesa/pkg-plist
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/vesa_drv.la
lib/xorg/modules/drivers/vesa_drv.so
man/man4/vesa.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 31dbda7d42c7..de0bb0c35778 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-vmware
PORTVERSION= 13.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
index 5b79c8f3e2de..727f3bae92f9 100644
--- a/x11-drivers/xf86-video-vmware/pkg-plist
+++ b/x11-drivers/xf86-video-vmware/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/vmware_drv.la
lib/xorg/modules/drivers/vmware_drv.so
man/man4/vmware.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 81ad6d1a4e2c..af36deeba18f 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-voodoo
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
index d4ef86aed783..12fa28b9abba 100644
--- a/x11-drivers/xf86-video-voodoo/pkg-plist
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/voodoo_drv.la
lib/xorg/modules/drivers/voodoo_drv.so
man/man4/voodoo.4x.gz
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d4441657abf2..240975efe782 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -4,7 +4,7 @@
PORTNAME= nautilus
PORTVERSION= 2.32.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,8 +20,8 @@ LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
CONFLICTS= nautilus-3.[0-9]*
INSTALLS_ICONS= yes
-USES= gettext desktop-file-utils shared-mime-info gmake pkgconfig \
- tar:bzip2 libtool pathfix
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gnomeprefix intlhack gnomedesktop \
librsvg2 gvfs
INSTALL_TARGET= install-strip
diff --git a/x11-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 9e8334bfe777..bb6fdc686bfc 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rodent
PORTVERSION= 4.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm
MASTER_SITES= SF/xffm/${PORTVERSION}/
@@ -18,7 +18,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/japanese/gawk \
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libmagic.so:${PORTSDIR}/sysutils/file
-USES= gmake libtool pkgconfig desktop-file-utils
+USES= desktop-file-utils gmake libtool:keepla pkgconfig
USE_GNOME= glib20 gtk20 librsvg2 libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--docdir=${DOCSDIR}
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 5f70f23b6e52..d21770c2b8f7 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libFS
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 44ad884decce..6a6660da05b8 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXfont
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index dde13cc62c68..63de4fa32ceb 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXfontcache
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 32b9d0bb0a3c..66a847c2cbae 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXft
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index bde12d7c2b59..e1e831233188 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libfontenc
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index aecc5442cc9e..34a82f0b9d8e 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -35,14 +35,14 @@ OPTIONS_EXCLUDE_sparc64= HAL
.if defined(WITH_NEW_XORG)
XORG_VERSION= 1.12.4
-XORG_REVISION= 5
+XORG_REVISION= 6
PLIST_SUB+= OLD="@comment " NEW=""
EXTRA_PATCHES+= ${FILESDIR}/extra-clang \
${FILESDIR}/extra-configure \
${FILESDIR}/extra-new-dix_dixfonts.c
.else
XORG_VERSION= 1.7.7
-XORG_REVISION= 12
+XORG_REVISION= 13
PLIST_SUB+= OLD="" NEW="@comment "
EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \
${FILESDIR}/extra-Xserver-os-xprintf.c \
@@ -53,8 +53,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \
${FILESDIR}/extra-old-dix_dixfonts.c
.endif
-USE_BZIP2= yes
-USES= gmake perl5 libtool
+USES= gmake libtool:keepla perl5 tar:bzip2
USE_PERL5= build
USE_GL= gl
USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
diff --git a/x11-themes/gtk-blueprint-engine/Makefile b/x11-themes/gtk-blueprint-engine/Makefile
index 316c80a1e7e1..446f5e9603a0 100644
--- a/x11-themes/gtk-blueprint-engine/Makefile
+++ b/x11-themes/gtk-blueprint-engine/Makefile
@@ -3,6 +3,7 @@
PORTNAME= blueprint
PORTVERSION= 0.9.20
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://dlc.sun.com/osol/jds/downloads/extras/
PKGNAMEPREFIX= gtk-
@@ -17,7 +18,7 @@ BUILD_DEPENDS= icon-naming-utils>=0.8.90:${PORTSDIR}/x11-themes/icon-naming-util
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pkgconfig gmake libtool perl5
+USES= gmake libtool:keepla perl5 pkgconfig
USE_GNOME= glib20 gtk20 intltool intlhack
INSTALLS_ICONS= yes
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 54d6ef5f7bc0..7e5f5e286f19 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= SoXt
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/
@@ -12,7 +12,7 @@ COMMENT= GUI binding for using Open Inventor with Xt/Motif
LIB_DEPENDS= libCoin.so:${PORTSDIR}/graphics/Coin
-USES= libtool motif pathfix perl5
+USES= libtool:keepla motif pathfix perl5
USE_GL= yes
USE_PERL5= build
USE_XORG= xi
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index c7bad2fe28fb..c818ee474021 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -4,20 +4,20 @@
PORTNAME= bakery
PORTVERSION= 2.6.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A C++ Application Framework for use with Gtkmm
+COMMENT= C++ Application Framework for use with Gtkmm
LIB_DEPENDS= libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm \
libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 3c59958e9e0a..f45eb5120a00 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generally useful classes and extensions to GNOME
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= xrender
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomedesktop intlhack
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 8ea3a3ad21ae..c5a8c0143bdf 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fox
PORTVERSION= 1.4.35
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -21,7 +21,7 @@ MAJORVER= ${PORTVERSION:R}
SHVER= ${PORTVERSION:S/${MAJORVER}.//}
PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
-USES= libtool
+USES= libtool:keepla
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=yes \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 0cde01add3b9..e852c83fd925 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fox
PORTVERSION= 1.6.49
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/ \
http://ftp.fox-toolkit.org/pub/
@@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
MAJORVER= ${PORTVERSION:R}
PLIST_SUB+= MAJORVER=${MAJORVER}
-USES+= libtool pathfix
+USES= libtool:keepla pathfix
USE_GL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index afbee6c6ca89..4e07eff95316 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fox
PORTVERSION= 1.7.46
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \
ftp://ftp.fox-toolkit.org/pub/
@@ -19,8 +19,8 @@ MAJORVER= ${PORTVERSION:R}
PLIST_SUB+= MAJORVER=${MAJORVER}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${MAJORVER}
-USES+= libtool pathfix
GNU_CONFIGURE= yes
+USES= libtool:keepla pathfix
USE_GL= glut
USE_XORG= sm xft
USE_LDCONFIG= yes
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 973b02705057..63a5d85ed756 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fxscintilla
PORTVERSION= 2.28.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= SAVANNAH
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 306644eded11..104b6d902d8c 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gal2
PORTVERSION= 2.5.3
-PORTREVISION?= 11
+PORTREVISION?= 12
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
@@ -12,13 +12,13 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A collection of widgets taken from GNOME 2 gnumeric
+COMMENT= Collection of widgets taken from GNOME 2 gnumeric
USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= pathfix gettext perl5 gmake pkgconfig libtool
+USES+= gettext gmake libtool:keepla pathfix perl5 pkgconfig
USE_GNOME= gnomeprefix intlhack libgnomeui libgnomeprintui
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index a9e38f8fe4cf..fe51f85de348 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -4,15 +4,15 @@
PORTNAME= gdl
PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Components intended to be shared between GNOME development tools
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix gtk20
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index f6b384b40bde..54394acc3067 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-sharp
PORTVERSION= 2.24.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -12,7 +12,7 @@ COMMENT= GNOME interfaces for the .NET runtime
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake libtool pathfix perl5 pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix perl5 pkgconfig tar:bzip2
USE_PERL5= run
USE_GNOME= gnomepanel gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/gstreamer1-plugins-pango/Makefile b/x11-toolkits/gstreamer1-plugins-pango/Makefile
index ce7fd500bfb6..b2950e795aaf 100644
--- a/x11-toolkits/gstreamer1-plugins-pango/Makefile
+++ b/x11-toolkits/gstreamer1-plugins-pango/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
COMMENT= Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 676b584c2c8b..42e4457f1074 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkdatabox
PORTVERSION= 0.9.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SF
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES
GLADE_DESC= Enable libglade2 support
GLADEUI_DESC= Enable glade3 support
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${PREFIX}/include/${PORTNAME}" \
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index e6be90876966..425f4fcfa7ae 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Useful widget set complementary to GTK+ 2.0
-USES= libtool pathfix pkgconfig gmake
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_CSTD= gnu89
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 60200526c820..867d9dce4f1a 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -4,18 +4,18 @@
PORTNAME= gtkglarea
PORTVERSION= 2.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DISTNAME= gtkglarea-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= An OpenGL widget for the GTK+2 GUI toolkit
+COMMENT= OpenGL widget for the GTK+2 GUI toolkit
-USE_GNOME= gtk20
+USES= libtool:keepla pathfix pkgconfig tar:bzip2
+USE_GNOME= gtk20
USE_GL= yes
-USES= libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index f6ffa2cf0e2d..e8dc0d67f1a7 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION?= 14
+PORTREVISION?= 15
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/${PORTNAME}/2.2
PKGNAMESUFFIX= 20
@@ -20,7 +20,7 @@ USES+= tar:bzip2
LIB_DEPENDS= libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES+= pathfix gmake libtool pkgconfig
+USES+= gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 95e58c12effa..b7c7af252758 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtkmm
PORTVERSION= 3.8.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 30
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk30 glibmm cairomm atkmm pangomm
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index b8798a82a363..462bc48f0c34 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -4,19 +4,19 @@
PORTNAME= gtksourceview
PORTVERSION= 1.8.5
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix libgnome libgnomeprintui intlhack referencehack
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 8bfebaf26407..f0e0ea60eca8 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 2.10.5
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -12,13 +12,13 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake pathfix libtool pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 gconf2 libxml2 intlhack referencehack
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 4974e4dcccfa..dae93e80f0f0 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -4,21 +4,21 @@
PORTNAME= gtksourceview
PORTVERSION= 3.4.2
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES= tar:xz
.if !defined(REFERENCE_PORT)
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
-USES+= libtool pathfix gettext gmake pkgconfig
USE_GNOME= gnomeprefix gtk30 libxml2 intlhack referencehack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no \
diff --git a/x11-toolkits/gtksourceviewmm3/Makefile b/x11-toolkits/gtksourceviewmm3/Makefile
index 12711a42dced..a8b425d34d7b 100644
--- a/x11-toolkits/gtksourceviewmm3/Makefile
+++ b/x11-toolkits/gtksourceviewmm3/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtksourceviewmm
PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -12,8 +12,8 @@ PKGNAMESUFFIX= 3
MAINTAINER= gnome@FreeBSD.org
COMMENT= C++ binding of GtkSourceView3
+USES= gmake libtool:keepla pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-USES= pathfix gmake pkgconfig tar:xz libtool
USE_GNOME= gtksourceview3 gnomeprefix gtkmm30
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 24f4e9d75eec..3da042767ade 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXaw
PORTVERSION= 1.0.12
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 6463fa5537ab..edc3cf1d6889 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXmu
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 5fe8f304528d..786efb51d8e5 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXt
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index fa96d3b9cc13..0af60edbb4dc 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.24.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -16,7 +16,7 @@ USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehier intlhack \
libgnomecanvas libgnome referencehack
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index edf064efc774..edfd4c7c9277 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgdiplus
PORTVERSION= 2.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
@@ -16,7 +16,7 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \
libcairo.so:${PORTSDIR}/graphics/cairo
GNU_CONFIGURE= yes
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_XORG= x11
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 43fb730c506b..5e6e14891dbc 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomeprintui
PORTVERSION= 2.18.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,8 +15,8 @@ COMMENT= Gnome print support library
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11 xpm
-USES= bison pathfix gettext gmake pkgconfig libtool tar:bzip2
USE_GNOME= gnomeprefix libgnomeprint libgnomecanvas \
intlhack
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 64dade5fbe7a..3a13b68ec7ee 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgnomeprintuimm
PORTVERSION= 2.5.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
libgnomeprintmm-2.5.so:${PORTSDIR}/print/libgnomeprintmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix libgnomeprintui
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 75469cf540c6..5780c1d0c689 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.28.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,8 +19,8 @@ LIB_DEPENDS= libgnomemm-2.6.so:${PORTSDIR}/x11/libgnomemm26 \
libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11
-USES= gmake libtool pathfix pkgconfig tar:bzip2
USE_GNOME= libgnomeui
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index d3c70b266ef8..37d8c87f6b59 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libpanelappletmm
PORTVERSION= 2.26.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomepanel
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index 92758e2306fe..af60176afe78 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libunique
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -13,7 +14,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
USE_XORG= ice x11
USE_XZ= yes
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= gtk30 gnomeprefix
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index edfffadb06e6..5535889ea47e 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libzvt
PORTVERSION= 2.0.1
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -11,8 +11,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library components for Zed's Virtual Terminal
+USES= bison gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11
-USES= bison libtool pathfix gmake pkgconfig tar:bzip2
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 libartlgpl2
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 02a17aa2e732..061ab3654f03 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -19,8 +19,4 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xawm=Xaw3d
INSTALL_TARGET= install-strip
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/lib/libMowitz.la
-# Anyone knows a better way?
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 2f4961dc972d..35f1bedef29a 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pango
PORTVERSION= 1.34.1
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +23,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= cairo glib20 introspection:build referencehack
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 655dad501118..c6c5424b96a6 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings used by modules in the GNOME Desktop
+COMMENT= Python bindings used by modules in the GNOME Desktop
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_SUB= yes
@@ -28,7 +28,7 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
libevdocument.so:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= 2
USE_GNOME= libgnomeprintui gnomepanel gnomedesktop \
gtksourceview libwnck nautilus2 pygnome2 metacity \
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 0f05161b7105..e4f212dc29e3 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-extras-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings for GNOME 2
+COMMENT= Python bindings for GNOME 2
OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
@@ -22,7 +22,7 @@ LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
libgksu2.so:${PORTSDIR}/sysutils/libgksu \
# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= yes
USE_GNOME= libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 1f6e0a1913dd..598e88a6f811 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome
PORTVERSION= 2.28.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings for GNOME 2
+COMMENT= Python bindings for GNOME 2
OPTIONS_DEFINE= EXAMPLES
@@ -22,9 +22,9 @@ OPTIONS_SUB= yes
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= 2
USE_LDCONFIG= yes
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
USE_GNOME= libgnomeui pygtk2
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index ecc4436c7e9e..a217594a58fa 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtksourceview-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A python bindings for the version 2 of the GtkSourceView library
+COMMENT= Python bindings for GtkSourceView 2
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix gtksourceview2 pygtk2
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 02af51825542..916162517570 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vdk
PORTVERSION= 2.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}lib/VDK%20for%20both%20Linux%20and%20Windows%20%28this%20is%20the%20new%20version%29/VDKLIB%20%28C%2B%2B%20wrapper%20for%20GTK%2B%29
@@ -13,7 +13,7 @@ COMMENT= C++ wrapper for GTK+ toolkit
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index ebd0a06521dd..2e258c1b0aae 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -4,7 +4,7 @@
PORTNAME= vte
PORTVERSION= 0.28.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ USES+= tar:xz
RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
-USES+= bison gettext gmake libtool pathfix pkgconfig
+USES+= bison gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME?= gnomeprefix gtk20 introspection:build referencehack
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 3aef67ebb3b6..858c0b6fbbb1 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-extra
PORTVERSION= 0.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -19,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
USE_GL= yes
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= intltool
USE_XORG= glproto
USE_LDCONFIG= yes
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 249865005623..755f7973aa85 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-main
PORTVERSION= 0.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -19,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GL= yes
-USES= gettext gmake pathfix pkgconfig libtool tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_CSTD= gnu89
USE_GNOME= intltool
USE_XORG= glproto
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 254cd38deb66..6c1a95c28d1c 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-unsupported
PORTVERSION= 0.8.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -20,7 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GL= yes
-USES= pathfix gettext gmake pkgconfig libtool tar:bzip2
+USES= pathfix gettext gmake libtool:keepla pkgconfig tar:bzip2
USE_GNOME= intltool
USE_XORG= glproto
USE_LDCONFIG= yes
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index f36c2126d111..288391db0dcd 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -2,7 +2,7 @@
PORTNAME= compiz
PORTVERSION= 0.8.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -18,7 +18,7 @@ RUN_DEPENDS= glxinfo:${PORTSDIR}/graphics/mesa-demos \
XORG_CAT= app
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gettext pathfix gmake libtool tar:bzip2
+USES= gettext gmake libtool:keepla pathfix tar:bzip2
USE_GL= glu
USE_GNOME= gconf2 libxslt
USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 614ba8d46550..8159eaa129b3 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compizconfig-backend-gconf
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
-USES= libtool pathfix pkgconfig gmake tar:bzip2
+USES= libtool:keepla pathfix pkgconfig gmake tar:bzip2
USE_GNOME= glib20 gconf2
post-patch:
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index f181fb8d47de..f03051a99953 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -2,7 +2,7 @@
PORTNAME= emerald
PORTVERSION= 0.8.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -15,8 +15,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_GL= gl
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:bzip2
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gtk20 libwnck pango
USE_XORG= xrender
USE_LDCONFIG= yes
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 6c4462ff6b70..dac0f243509f 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libcompizconfig
PORTVERSION= 0.8.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -16,7 +16,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= intltool libxml2
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 946237bd2789..97da296afec8 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= xride
@@ -14,12 +14,12 @@ COMMENT= Standard library for Window Maker dock apps
OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
-USES= libtool
+USES= libtool:keepla
USE_BZIP2= yes
+USE_LDCONFIG= yes
USE_XORG= xext xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-font --without-examples
-USE_LDCONFIG= yes
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 2e46a1fef258..462af5e089d0 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -4,7 +4,7 @@
PORTNAME= metacity
PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_XORG= x11 xcomposite xdamage
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gconf2 gtk20
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index d9717cc1c693..40142d6c161d 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mutter
PORTVERSION= 2.31.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +19,7 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GNOME= gnomeprefix intlhack gtk20 gconf2
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 8dbcef447b3e..ba6c52a2fa53 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openbox
PORTVERSION= 3.5.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://openbox.org/dist/openbox/
@@ -13,7 +13,7 @@ COMMENT= Small, fast, standards compliant, extensible window manager
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= libtool gmake pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= glib20 libxml2
USE_XORG= xft
USE_LDCONFIG= yes
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index f56b5663d370..81f596cf55f4 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dgs
PORTVERSION= 0.5.9.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ../old-gnu/dgs
@@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE= yes
USE_GHOSTSCRIPT_RUN= yes
USE_XORG= xt sm ice xext x11
USE_GNOME= glib12
-USES= gmake libtool
+USES= gmake libtool:keepla
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-0.5.9
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b62addebd736..2e67e767e33c 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.1
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,14 +12,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional UI API for GNOME 2
-USES= tar:bzip2
+USES= tar:bzip2
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+USES+= bison gettext gmake libtool:keepla pathfix pkgconfig
USE_XORG= xpm
-USES+= bison pathfix gettext libtool pkgconfig gmake
USE_GNOME= gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
referencehack
USE_PYTHON= 2
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 045735b5062c..a2238176fb0c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-panel
PORTVERSION= 2.32.1
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,7 +28,7 @@ INSTALLS_OMF= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USES+= pathfix libtool gettext gmake pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
gnomedocutils referencehack librsvg2
GNU_CONFIGURE= yes
diff --git a/x11/gstreamer1-plugins-x/Makefile b/x11/gstreamer1-plugins-x/Makefile
index 1dbe602c8921..4f4b5cd07aaf 100644
--- a/x11/gstreamer1-plugins-x/Makefile
+++ b/x11/gstreamer1-plugins-x/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
COMMENT= Gstreamer X and Xvideo output plugins
diff --git a/x11/gstreamer1-plugins-ximagesrc/Makefile b/x11/gstreamer1-plugins-ximagesrc/Makefile
index 6518baadabba..4839f931f618 100644
--- a/x11/gstreamer1-plugins-ximagesrc/Makefile
+++ b/x11/gstreamer1-plugins-ximagesrc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
PKGNAMESUFFIX= 1-plugins-ximagesrc
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 5120976ed560..3e6ec341c19a 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libICE
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 01233f126c6b..caf24c7a7d55 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libSM
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 3df2bb763367..cdda1df86b94 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libX11
PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index be2f48a4f9ea..62ad47ce731d 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXScrnSaver
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index b54c61e0d9ec..7310d43d3054 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXTrap
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index addf5113b98f..68cc026b063c 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXau
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index 2638fb10ae87..57a430964e77 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXcm
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/oyranos/${PORTNAME}/${PORTNAME}-${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 6c81c9edb856..5a6699d3c8cd 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcomposite
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 63f4ab49b915..caa96349fb0d 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcursor
PORTVERSION= 1.1.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 24c1dfcd849f..bc61501e5550 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXdamage
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 602ff5685d9f..fb4a51a2dff6 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXdmcp
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 9e1b46677b8d..5f3b2abcaaae 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXevie
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index adf905fbc0e3..29a8f8ee8e8d 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXext
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index f08c43afa749..14365d9d2c7c 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXfixes
PORTVERSION= 5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 6a6e2ec8a085..7a85e91fb509 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXi
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index c8d3f33cdd34..e82781c7f495 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXinerama
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 4aaa1a51af44..1cee8c8073c9 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXp
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index b522c7f368a7..6fc4dd8f4859 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXpm
PORTVERSION= 3.5.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index d659d4e77555..9ff7451e9626 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintAppUtil
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 5f9c05d3ecc5..6021a9e4df72 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintUtil
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 976773363c1b..99e610abb452 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrandr
PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index a7aaf8d08b9c..ddb2ed1f82bd 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrender
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 0eef9908dea5..a4f0a9fd7612 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXres
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index ac4c59a13478..154ca97dd7f8 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXtst
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 1555c8dcf3f0..a3a2a9f7dbb6 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXv
PORTVERSION= 1.0.10
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 407966ee772e..9d3ff4ae0cb7 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXvMC
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index cb6fe45a8b72..316a86feeffa 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86dga
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 5031242190ab..dffd60f7ff8f 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86misc
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index acd2f95c14f1..6a66742271ba 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86vm
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 4ffb3ebe4806..568f57ce74ec 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdmx
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4f41c29e2857..6da4de96b583 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnome
PORTVERSION= 2.32.0
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +23,7 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
INSTALL_TARGET= install-strip
USE_GNOME= gnomeprefix intlhack esound libbonobo \
gnomevfs2 referencehack
-USES+= bison libtool pathfix gettext gmake pkgconfig
+USES+= bison gettext gmake libtool:keepla pathfix pkgconfig
USE_XORG= xpm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index f806186d29c7..ea7a604dd7df 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomekbd
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gconf2
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-USES= gettext libtool pathfix pkgconfig gmake tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 295a9c990856..8aa5feb42658 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ COMMENT= C++ wrapper for libgnome library
LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= xext
USE_GNOME= libgnome
GNU_CONFIGURE= yes
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 0f7e01742e14..c4bbb73dd016 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmatekbd
PORTVERSION= 1.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -15,7 +15,7 @@ LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
USE_GNOME= gnomehier glib20 gtk20 intlhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index f1b615773d38..ba70b3c08ab3 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -2,7 +2,7 @@
PORTNAME= liboldX
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 2f43a501b944..ce6c01d3a590 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxcb
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 9abb9a67f072..de10e096a200 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libxkbcommon
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xkbcommon.org/download/
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 99c4946809b0..e76f09f86ab7 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbfile
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index a928f8162a95..d0c33ec0c9a3 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbui
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2d1602d77ade..677e6c4c264e 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libxklavier
PORTVERSION= 5.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-USES= libtool pathfix gmake pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11 xi xkbfile
USE_GNOME= libxml2 glib20
USE_LDCONFIG= yes
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 3acdac95ad63..c6c3e1705f9e 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxshmfence
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 43d7a1cf1203..14d07ef98643 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pixman
PORTVERSION= 0.32.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 82ba070f8f9c..7bf13f1b6d3d 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-cursor
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 2649b6b0d425..74a9bbd781b8 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-image
PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 3bc01bd46222..7cb54901d9b5 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-keysyms
PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 98c3d78b671a..f82de0a6da46 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-renderutil
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index eaed5195ed06..21b9f3d3f1c9 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-wm
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index cf6bd9a38942..afa9c1ccd9ba 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xcb-util
PORTVERSION= 0.3.9
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index 7c8a3907493a..1d6fc8907c7a 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xrx
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= RX helper program
XORG_CAT= app
USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice
-USES= libtool
+USES= libtool:keepla
USE_LDCONFIG= yes
post-patch:
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index ccfde005795f..8573356dde9e 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xtrans
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org