... And bump PORTREVISION on ports that depend on devel/qscintilla2 due to
the shlib version change.
This is brought to you by the KDE on FreeBSD team. Besides updating to newer
upstream releases, this commit also contains a lot of under-the-hood changes
to the PyQt/QScintilla/SIP ports. Their Makefiles had accumulated a lot of
cruft over time, so it was time for some summer cleaning:
- General, belated changes:
* Use OPTIONS helpers wherever possible, stop including
<bsd.port.options.mk> when not necessary, stop checking for
${PORT_OPTIONS:MDOCS} and ${PORT_OPTIONS:MEXAMPLES} when not necessary,
add options such as DOCS and/or DEBUG where they were only checked for.
- QScintilla ports:
* Drop the API option from py-qt4-qscintilla2. It had been broken ever
since staging support was added, and its existence does not make much
sense: QScintilla is a hard dependency regardless of the state of this
option anyway, they all come from the same tarball and the configuration
script assumes the .api file will always be installed.
- PyQt ports:
* The configure.py patch shared by all PyQt ports has been trimmed down to
the minimum. Changes for Qt3 compatibility or for things that are just
not needed anymore have been removed.
* Several post-configure targets in the PyQt ports have been removed, as
they had no effect on the way the ports were built whatsoever.
* In some cases, instead of calling Python's py_compile.py on `ls *.py
*/*.py */*/*.py` to generate .pyc and .pyo files, we just call
compileall.py, which is made for this kind of task.
* The patch + sed hack to build py-qt4-dbussupport has been replaced by
only extracting the dbus/ directory for that port and excluding it from
all others.
* Move the bulk of the code in all Makefiles to bsd.pyqt.mk, like the
non-Python Qt ports do with bsd.qt.mk and the QT_DIST variable. A large
portion of all PyQt Makefiles were very similar and contained a lot of
boilerplate code that can be shared among all of them since they all
come from the same tarball. bsd.pyqt.mk now has a PYQT4_DIST variable
that, when set, automatically sets several common variables and the
do-configure target for a port. This allows us to considerably reduce
the size of all the py-qt4-* Makefiles.
* To make the above possible and also to allow us to use as many OPTIONS
helpers as possible, the ARGS variable is now called CONFIGURE_ARGS.
That's what it was used for anyway.
PR: 191990
when an older version of a package is installed. This is the case when an
executable links with installed libraries and with uninstalled libraries
that link with other uninstalled libraries. For each of the directly
linked libraries the executable will have an rpath (/usr/local/lib for the
installed libraries and a path under WRKDIR for each of the uninstalled
libraries), but not for the indirect libraries. Both ld(1) and rtld(1)
search the rpath of the executable first before any rpath of libraries, so
the indirectly linked libraries will be found in /usr/local/lib if they are
installed instead of in WRKDIR.
With this commit executables will overlink with uninstalled indirect
libraries again so their location is added to the rpath of the executable.
This partially reverts r358784.
PR: 191611
Approved by: portmgr (bapt)
A lot of bug fixes.
Add commands to the dbus interface.
Add command line options to control the keyboard.
Move at-spi2 handling to a new process in order to avoid deadlocks.
Implement a floating icon for desktops with no systray.
Fix gradients.
remove deprecated GTK3 functions.
- Remove BUILD_DEPENDS and RUN_DEPENDS, implicit
- Add USES=libtool, .la
- Change USE_GSTREAMER to USE_GSTREAMER1
- Add --disable-static to CONFIGURE_ARGS
- Quote variable in CONFIGURE_ARGS
- Add NLS_CONFIGURE_ENABLE=nls
- Strip library
- Change pkg-plist
PR: 190363
Submitted by: maintainer (Horia Racoviceanu)
LeechCraft is a free open source cross-platform modular live environment.
It has modules for everything:
* Full-featured web-browser with support for all major web-standards.
* Advanced multiprotocol modular IM client currently supporting XMPP (Jabber),
IRC, WLM/MSN, MRIM and quite a few other protocols and with a bunch of
features from metacontacts and Off-The-Record support to audio calls.
* Collection-oriented media player with a lot of features from gapless
playback and transcoding for removable devices to social features like
recommended artists and nearby events.
* Efficient and fast BitTorrent client with full support for the BitTorrent
protocol and all its widespread extensions and magnet links.
* Modular document viewer supporting PDF, DjVu, PostScript, MOBI and other
formats.
* RSS feed reader supporting common feed formats with extensions like MediaRSS
or GeoRSS as well as with extensive support for Broadcatching and podcasts and
their automatic retrieval.
* User-space package manager with its own repository of plugins, themes, icons
and much more.
* A bunch of Desktop Environment-enabling modules from window manager
controller to power manager, taskbar, tray and a customizable panel.
* The "Summary" tab that displays all your downloads, updates and statuses.
PR: 170571
Submitted by: myself
<OPTION>_CONFIGURE_ARGS does not exist, so the option was not being passed
at all. We need <OPTION>_CONFIGURE_WITH here.
CR: D357
Approved by: olgeni (maintainer)
- ports that set USE_SQLITE with the *_USE option helper
- ports that depend on libsqlite3 indirectly as reported by pkg rquery
Approved by: portmgr (implicit)
- Add libtoolize:env to USE_AUTOTOOLS
- Add static libraries to Options, remove from default
- Add nls to CONFIGURE_ARGS
while here
- Use @sample in pkg-plist
PR: ports/191589
Submitted by: Horia Racoviceanu <horia@racoviceanu.com>
- USES=libtool
- Remove -DPREFIX=\\\"${PREFIX}\\\" from CPPFLAGS. Not needed and it
causes configure test failures with clang.
- Use MAKE_CMD.
- Bump dependent ports.
x11-wm/windowmaker:
- USES=libtool
- Replace -DPREFIX=\\\"${PREFIX}\\\" in CPPFLAGS with post-patch command
because it causes configure test failures with clang.
- Remove FreeBSD < 8 support.
changes that Debian made to their libtool. The first command applies to
libtool versions 1.4 and up. The second command is somewhat more elaborate
but essentially it uses the sed hold space to move an "elif...fi" block
down. It applies to 2.x. Together these reduce overlinking to unpatched
.la files (from ports that don't have USES=libtool yet but also .la files
in the work directory).
The third and fourth command fix relinking. During staging libtool may
relink libA when it links to another library in the work directory libB.
The reason is that libA created during build phase has its runpath set to
the location of libB in the work directory. This allows running an
executable that links to libA from within the work directory. The relink
removes this extra runpath.
When libtool relinks libA it replaces "libB.la" on the linker command line
with "-L${STAGEDIR}${PREFIX}/lib -lB" with the intention to link to libB in
the stage directory but this -L flag isn't necessarily the first so another
libB may be linked instead. The two sed commands make relink the same as a
normal link. This means libtool will relink with libraries from the work
directory using a path similar to "../srcB/.libs/libB.so" without -L flags.
This applies to libtool 1.4 and up. Earlier versions don't seem to relink
libraries.
(This fixes ports like devel/apr1 so they link with freshly built libraries
instead of installed libraries.)
Fix all ports with missing libraries.
Additionally:
archivers/rpm4: USES=patchfix.
databases/gdbm: INSTALL_TARGET=install-strip.
devel/gnome-vfs: remove patch that doesn't change anything.
devel/ois: INSTALL_TARGET=install-strip and use standard USE_AUTOTOOLS.
devel/zziplib: INSTALL_TARGET=install-strip, MAKE_CMD.
multimedia/mjpegtools: remove USE_AUTOTOOLS, use modern compiler on i386
instead of disabling optimisations.
net/libnetdude: disable static plugins.
PR: 190941
Exp-run: antoine
Approved by: portmgr (antoine)
Use USES=compiler:openmp for the OPENMP option[2]
Ditch the use of perl for patching etc [4] and silence perl threaded check [6]
-delay option spurious message should be fixed [5]
JASPER option was replace by JPEG2000 for JP2k support.
Put 16BIT_PIXEL and HDRI option separate option block. These options change
the library name, so the user needs to take this into consideration.
Use new LIB_DEPENDS syntax.
Use @sample for config files.
Sprinkle some USES=pkgconfig for some ports, since we don't pull it in
anymore at run-time.
PR: 185462 [1]
PR: 187548 [2]
PR: 182793 [3]
PR: 181746 [4]
PR: 176047 [5]
PR: 190814 [6]
Submitted by: c.petrik.sosa@gmail.com [1]
Matthieu Volat <mazhe@alkumuna.eu> [2]
free.bsd@webstyle.ch [3]
andrnils@gmail.com [4]
rfg@tristatelogic.com [5]
Michelle Sullivan <michelle@sorbs.net> [6]
Approved by: portmgr (blanket) (for NO_STAGED ports)
- Convert to PYDISTUTILS_AUTOPLIST
- Bump PORTREVISION to enforce a cleanup for the easy_install references
With hat: python@
Approved by: portmgr (implicit)
Sylvio's last commit was 17 months ago, a full 5 months after all of his
ports could have been reset per policy. Given the push to complete
staging (48 ports are still unstaged, something like 70+ have already
been staged by other committers) and given that PRs are automatically
assigned but never addressed, it's better just to reset all the ports and
PRs so that it's clear to others that these ports are free to maintain.
Approved by: portmgr (implicit)
- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV.
- Add an option helper for LIBS.
- Adjust all ports that already use LIBS. Also remove references to
PTHREAD_CFLAGS and PTHREAD_LIBS while here.
- Some ports did not support having a LIBS environment variable and
required additional patches.
Somewhat simplified a linker command line looks like:
${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS}
where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and
LIBS can be controlled by us. If possible -L and -l flags need to be
added to LIBS to make sure they appear after any -L and -l flags set by
upstream. Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this
may appear too early on the command line causing installed libraries to
be linked in instead of freshly built ones.
Additional changes:
benchmarks/netio: Replace WITH_IPV6 with an IPV6 option.
comms/gnokii: Replace some patches with USES=pathfix. Also remove -fPIC.
graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR.
graphics/visionworkbench: Remove FreeBSD 7 support.
multimedia/libmovtar: New LIB_DEPENDS syntax.
multimedia/opencinematools: Use standard do-build.
net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins)
net-mgmt/nagios: Remove -fPIC.
net-mgmt/nagios4: Remove -fPIC.
print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036.
security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with
ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS. This skips a test
in configure that falsely detects pthread_mutexattr_init in our libc.
sysutils/dar: Fix iconv detection.
x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD
hack and use $CXX as linker as on other platforms.
PR: 190592
Exp-run by: antoine
Approved by: portmgr (antoine)
Starting with perl 5.20, they're not installed any more if empty,
and on FreeBSD, they're (always ?) empty.
PR: 190681
Submitted by: mat
Exp-Run by: antoine
Sponsored by: Absolight
2014-05-25 x11-toolkits/libgtk-java: Unmaintained, outdated not depend on
2014-05-25 graphics/cairo-java: Unmaintained, outdated not depend on
2014-05-25 devel/libgconf-java: Unmaintained, outdated not depend on
2014-05-25 x11/libgnome-java: Unmaintained, outdated not depend on
lang/lua51 is working the same way lang/lua52, chase ports using lua 5.1
Make the default lua lua52
Make all lua ports using USES=lua
Approved by: portmgr (implicit)
- Use MACHINE_CPUARCH rather than MACHINE_ARCH. While the former technically
is more correct it unfortunately doesn't exist in stable/8, yet, and using
the latter actually doesn't make a difference for i386.
- Allow to build nvidia-driver on OSVERSION > 1000052 with the LINUX option
enabled.
Reported by: swills
- For i386, allow to build the non-legacy NVIDIA drivers with PAE support
via an option, defaulting to disabled. This is tricky in two ways. First
off, while their binary part is PAE-capable since around version 285,
their build glue and wrapper only partially is. Second, for modules
built along the kernel, enabled PAE support would be picked up via the
generated opt_global.h from KERNBUILDDIR, which isn't available when
compiling modules stand-alone. Nevertheless, these source modifications
are modeled in a way so they also do the right thing when integrating a
nvidia-driver module into a kernel build.
Approved by: maintainer timeout (2 weeks)
Sponsored by: Bally Wulff Games & Entertainment GmbH
And USES=tar:bzip2 here and there.
deskutils/xfce4-notification-daemon:
- Don't patch Makefile.am.
- Link with -lgmodule-2.0 explicitly now that libgtk-x11-2.0.la does not
imply it.
x11/xfce4-wmdock-plugin:
- Make it fetchable.
Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a
replacement for :U and :L (which has been marked as deprecated)
bmake which is the default on FreeBSD 10+ only support by default
:tu/:tl a hack has been added at the time to support :U and :L to ease
migration. This hack is now not necessary anymore
Note that this makes the ports tree incompatible with make(1) from
FreeBSD 8.3 or earlier
With hat: portmgr
They have never been used, are not updated upstream since 2009 and gnome@ team has already way too many things to care about
Discussed with: kwm (gnome)
Approved by: self (portmgr)
2014-04-23 emulators/mupen64-sdlinput: Use mupen64plus instead
2014-04-23 emulators/mupen64-sdlaudio: Use mupen64plus instead
2014-04-23 emulators/mupen64-tr64: Use mupen64plus instead
2014-04-23 emulators/mupen64-gln64: Use mupen64plus instead
2014-04-23 emulators/mupen64-sound: Use mupen64plus instead
2014-04-23 emulators/mupen64-rsp: Use mupen64plus instead
2014-04-23 emulators/mupen64-input: Use mupen64plus instead
2014-04-23 emulators/mupen64-glide: Use mupen64plus instead
2014-04-23 emulators/mupen64: Use mupen64plus instead
2014-04-23 emulators/mupen64-softgfx: Use mupen64plus instead
2014-04-23 emulators/mupen64-dummyaudio: Use mupen64plus instead
2014-04-23 emulators/mupen64-base: Use mupen64plus instead
2014-04-24 x11/emu: Broken, not staged
2014-04-24 lang/ruby-doc-stdlib: Upstream rerolls frequently, online docs work well
- Convert to USES=libtool.
- Add include directories to CPPFLAGS instead of CFLAGS.
- Use LDFLAGS instead of LIBS.
- Remove PTHREAD_LIBS reference.
- Add DOCS option.
- Staging.
- Remove MAKE_ENV. Not needed.
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)
