On 2015/04/21 12:03, Vadim Zhukov wrote:
> 21 апр. 2015 г. 10:57 пользователь "Stuart Henderson" <st...@openbsd.org>
> написал:
> >
> > On 2015/04/20 21:30, Vadim Zhukov wrote:
> > > Here is a first attempt on automated WANTLIB tweaking. Features:
> > >
> > > * Removal, addition and updating WANTLIB items:
> > >
> > > -w foo Removes all foo* ("foo", "foo>=2" and so on) items;
> > > -W foo Replaces all foo* items with "foo", or add "foo"
> > > to the list if there is none;
> >
> > Ahh... This is useful when cleaning up after a library removal/addition
> > from a port, but I probably didn't explain myself very well because it's
> > not what I need to fix the existing ports breakage. But now I see why
> > you thought it was possible to handle multipackages ;-)
>
> I.e., the proposed diff doesn't solve your problem? If so, could you,
> please, provide example (or few examples) of command line and resulting
> changes in port Makefile? This way it may be easier for us to understand
> each other. :)
General procedure:
- remove existing WANTLIB lines
- use check-lib-depends (probably just by running "make
port-lib-depends-check") to generate replacement lines
- insert replacement lines in-place and bump
So to pick a couple of random examples - most are simple - out of these,
line placement in arts3 is going to be tricky, this is how I'd probably
do it by hand but anything that has the same end result for variables
would be useful :)
There are 600+ ports that need fixing, out of those 450+ look like they
will probably be simple cases, so if we can automate most of the simple
cases it will probably cut somewhere around 10 days of very tedious work
down to 2 or so.
Index: devel/appstream-glib/Makefile
===================================================================
RCS file: /cvs/ports/devel/appstream-glib/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/appstream-glib/Makefile 4 Apr 2015 09:21:00 -0000 1.7
+++ devel/appstream-glib/Makefile 21 Apr 2015 09:23:12 -0000
@@ -7,7 +7,7 @@ COMMENT= library for AppStream metadata
DISTNAME= appstream-glib-0.2.8
EXTRACT_SUFX= .tar.xz
-REVISION= 0
+REVISION= 1
SHARED_LIBS += appstream-builder 0.0 # 6.6
SHARED_LIBS += appstream-glib 0.0 # 6.6
@@ -26,7 +26,7 @@ WANTLIB += Xinerama Xrandr Xrender archi
WANTLIB += atspi bz2 c cairo cairo-gobject dbus-1 expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz lzma
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += lzo2 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs soup-2.4 sqlite3 xcb xcb-render
WANTLIB += xcb-shm xml2 z
Index: graphics/amide/Makefile
===================================================================
RCS file: /cvs/ports/graphics/amide/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- graphics/amide/Makefile 4 Apr 2015 09:21:01 -0000 1.41
+++ graphics/amide/Makefile 21 Apr 2015 09:23:12 -0000
@@ -4,25 +4,24 @@ COMMENT = Amide a Medical Imaging Data E
DISTNAME = amide-1.0.5
CATEGORIES = graphics
-REVISION = 2
+REVISION = 3
HOMEPAGE = http://amide.sourceforge.net/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += X11 Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2
-WANTLIB += atk-1.0 avcodec avutil c cairo expat fontconfig
-WANTLIB += freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnomecanvas-2 gobject-2.0
-WANTLIB += gsl gslcblas gsm gthread-2.0 gtk-x11-2.0 m mdc mp3lame
-WANTLIB += ogg orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB += pixman-1 png pthread pthread-stubs schroedinger-1.0
-WANTLIB += speex stdc++ theoradec theoraenc vorbis vorbisenc vpx
-WANTLIB += x264 xcb xcb-render xcb-shm xml2 z
-WANTLIB += dbus-1 dbus-glib-1 ffi graphite2 opus
-WANTLIB += harfbuzz xvidcore
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender art_lgpl_2 atk-1.0 avcodec avutil c
+WANTLIB += cairo dbus-1 dbus-glib-1 expat ffi fontconfig freetype
+WANTLIB += gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gnomecanvas-2 gobject-2.0 graphite2
+WANTLIB += gsl gslcblas gsm gthread-2.0 gtk-x11-2.0 harfbuzz lzma
+WANTLIB += m mdc mp3lame ogg opus orc-0.4 pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB += schroedinger-1.0 speex stdc++ swresample theoradec
+WANTLIB += theoraenc vorbis vorbisenc vpx x264 x265 xcb xcb-render
+WANTLIB += xcb-shm xml2 xvidcore z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amide/}
Index: x11/kde/arts3/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/arts3/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- x11/kde/arts3/Makefile 23 Jan 2013 21:10:37 -0000 1.77
+++ x11/kde/arts3/Makefile 21 Apr 2015 09:23:12 -0000
@@ -4,6 +4,7 @@ COMMENT = K Desktop Environment, aRTs
CATEGORIES = x11 x11/kde
VERSION = 3.5.10
DISTNAME = arts-1.5.10
+REVISION = 8
MODKDE_VERSION = 3.5.8
SHARED_LIBS += mcop 2.0 # .1.0
@@ -25,6 +26,13 @@ SHARED_LIBS += x11globalcomm 2.0
MODULES = x11/kde devel/gettext
+WANTLIB += FLAC GL ICE SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
+WANTLIB += audiofile c drm expat fontconfig freetype glapi glib-2.0
+WANTLIB += gmodule-2.0 gthread-2.0 jpeg lcms m mad mng ogg pcre
+WANTLIB += png pthread pthread-stubs sndio stdc++ vorbis vorbisenc
+WANTLIB += vorbisfile xcb xcb-dri2 xcb-glx z
+
LIB_DEPENDS = devel/libaudiofile \
devel/glib2 \
audio/libvorbis \
@@ -37,13 +45,6 @@ CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/l
CONFIGURE_ARGS += ${ENABLE_SHARED} \
--without-jack \
--without-esd
-
-REVISION = 7
-WANTLIB = ICE SM X11 Xext audiofile c glib-2.0 gmodule-2.0 \
- gthread-2.0 jpeg m mad ogg pcre png pthread sndio stdc++ \
- vorbis vorbisenc vorbisfile xcb z mng Xrender Xt Xxf86vm \
- GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr \
- drm expat fontconfig freetype lcms
post-patch:
cp ${FILESDIR}/audioiosndio.cc ${WRKSRC}/flow
