cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some duplicate wantlibs, use the libiconv MODULE where applicable.

Browse Source
This commit is contained in:
ajacoutot 2011-07-07 01:06:59 +00:00
parent 8dedb9873a
commit 89a1cb30b4
17 changed files with 88 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
comms/hamlib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2011/06/08 17:32:05 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT-main= radio/rotator control library
COMMENT-python= python bindings for hamlib
@ -7,11 +7,11 @@ COMMENT-tcl= tcl bindings for hamlib
VERSION= 1.2.6
DISTNAME= hamlib-${VERSION}
PKGNAME-main= hamlib-${VERSION}
REVISION-main = 5
REVISION-main = 6
PKGNAME-python= hamlib-python-${VERSION}
REVISION-python = 6
REVISION-python = 7
PKGNAME-tcl= hamlib-tcl-${VERSION}
REVISION-tcl = 5
REVISION-tcl = 6
CATEGORIES= comms hamradio
MULTI_PACKAGES= -main -python -tcl
@ -21,7 +21,7 @@ SHARED_LIBS= hamlib 2.5 \
HOMEPAGE= http://hamlib.sourceforge.net/
MODULES= lang/python lang/tcl
MODULES= lang/python lang/tcl converters/libiconv
# GPLv2/LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
@ -29,13 +29,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB = m usb>=9
WANTLIB-main = ${WANTLIB} c stdc++ z xml2 iconv
WANTLIB-python = ${WANTLIB} hamlib ${MODPY_WANTLIB}
WANTLIB-tcl = ${WANTLIB} hamlib ${MODTCL_WANTLIB}
cWANTLIB = m usb>=9
WANTLIB-main = ${cWANTLIB} c stdc++ z xml2 ${MODLIBICONV_WANTLIB}
WANTLIB-python = ${cWANTLIB} hamlib ${MODPY_WANTLIB}
WANTLIB-tcl = ${cWANTLIB} hamlib ${MODTCL_WANTLIB}
LIB_DEPENDS-main= textproc/libxml \
converters/libiconv \
devel/libusb
LIB_DEPENDS-python= ${BUILD_PKGPATH} \
${MODPY_LIB_DEPENDS}
@ -50,8 +49,9 @@ CONFIGURE_STYLE= gnu
BUILD_DEPENDS= devel/swig
RUN_DEPENDS-main=
RUN_DEPENDS-tcl=
RUN_DEPENDS-main= ${MODLIBICONV_RUN_DEPENDS}
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
RUN_DEPENDS-tcl= ${MODTCL_RUN_DEPENDS}
# --without-winradio do not build winradio backend
# --with-gnuradio build gnuradio backend

10
databases/strigi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2010/11/15 00:22:54 espie Exp $
# $OpenBSD: Makefile,v 1.13 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY = Yes
COMMENT = document indexer
@ -7,6 +7,8 @@ CATEGORIES = databases devel textproc sysutils
HOMEPAGE = http://strigi.sourceforge.net
DISTNAME = strigi-0.7.2
REVISION = 0
EXTRACT_SUFX = .tar.bz2
MASTER_SITES = http://www.vandenoever.info/software/strigi/ \
http://spacehopper.org/mirrors/
@ -31,10 +33,10 @@ LIB_DEPENDS = clucene-core->=0.9.21:textproc/clucene \
graphics/exiv2
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene>=1 dbus-1 exiv2 \
fontconfig freetype glib-2.0 gthread-2.0 iconv lib/qt4/QtCore \
lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z
fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \
lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z ${MODLIBICONV_WANTLIB}
MODULES += devel/cmake
MODULES += devel/cmake converters/libiconv
CONFIGURE_STYLE = cmake
SEPARATE_BUILD = simple

5
games/gargoyle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2010/11/16 11:23:26 espie Exp $
# $OpenBSD: Makefile,v 1.11 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY = Yes
@ -6,6 +6,7 @@ COMMENT = cross-platform interactive fiction player
DISTNAME = gargoyle-2010.1-sources
PKGNAME = gargoyle-2010.1
REVISION = 0
EPOCH = 0
CATEGORIES = games x11
@ -24,7 +25,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender c cairo expat fontconfig \
freetype iconv m pixman-1 pthread pthread-stubs xcb stdc++ \
freetype m pixman-1 pthread pthread-stubs xcb stdc++ \
vorbisfile z gdk_pixbuf-2.0 SDL>=2.0 SDL_sound SDL_mixer \
atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 \
gdk-x11-2.0 jpeg>=62 pango-1.0>=1600.0 \

10
graphics/GraphicsMagick/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2011/03/14 09:17:00 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= image processing tools with stable ABI
DISTNAME= GraphicsMagick-1.3.12
REVISION= 0
REVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
@ -23,8 +23,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= bz2 c iconv jasper jbig lcms ltdl jpeg \
m png pthread stdc++ tiff xml2 z
WANTLIB= bz2 c jasper jbig lcms ltdl jpeg \
m png pthread stdc++ tiff xml2 z ${MODLIBICONV_WANTLIB}
MODULES= converters/libiconv
LIB_DEPENDS= archivers/bzip2 \
devel/libtool,-ltdl \

6
graphics/ImageMagick/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.112 2011/07/06 22:43:00 kili Exp $
# $OpenBSD: Makefile,v 1.113 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,6 +8,7 @@ VER= 6.6.6
DASHVER= 10
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
REVISION= 0
SHARED_LIBS += Magick++ 14.0 # .1.0
SHARED_LIBS += MagickCore 2.0 # .1.0
@ -84,8 +85,9 @@ CONFIGURE_ARGS += --without-x \
--without-freetype \
--without-wmf
.else
MODULES += converters/libiconv
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt expat fontconfig \
freetype iconv pthread-stubs xcb wmf wmflite>=7 \
freetype pthread-stubs xcb wmf wmflite>=7 \
xml2>=9
LIB_DEPENDS += graphics/libwmf \
textproc/libxml

8
graphics/luagd/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2010/11/17 08:05:15 espie Exp $
# $OpenBSD: Makefile,v 1.14 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= gd binding for the lua language
V= 2.0.33r2
PKGNAME= luagd-$(V)
DISTNAME= lua-gd-$(V)
REVISION= 4
REVISION= 5
CATEGORIES= graphics
HOMEPAGE= http://lua-gd.luaforge.net/
@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= lang/lua
WANTLIB= freetype fontconfig iconv z jpeg>=62 png>=2 gd>=20.33
MODULES= lang/lua converters/libiconv
WANTLIB= freetype fontconfig z jpeg>=62 png>=2 gd>=20.33
LIB_DEPENDS= graphics/jpeg graphics/png graphics/gd
NO_REGRESS= Yes

7
graphics/pecl-imagick/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2010/11/17 08:05:15 espie Exp $
# $OpenBSD: Makefile,v 1.4 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= PHP support for the ImageMagick library
DISTNAME= imagick-2.3.0
PKGNAME= pecl-${DISTNAME}
REVISION= 0
CATEGORIES= graphics www
HOMEPAGE= http://pecl.php.net/package/imagick/
@ -22,13 +23,15 @@ EXTRACT_SUFX= .tgz
AUTOCONF_VERSION= 2.62
AUTOMAKE_VERSION= 1.9
MODULES= converters/libiconv
BUILD_DEPENDS= www/pear \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS= graphics/ImageMagick
RUN_DEPENDS= www/php5/core
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xt bz2 expat fontconfig freetype \
iconv jasper jbig jpeg lcms m png pthread-stubs tiff \
jasper jbig jpeg lcms m png pthread-stubs tiff \
wmflite xcb xml2 z MagickCore MagickWand
CONFIGURE_STYLE=gnu

8
graphics/smpeg-xmms/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2010/11/17 08:05:16 espie Exp $
# $OpenBSD: Makefile,v 1.18 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= MPEG and VCD video playback in XMMS
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ SHARED_ONLY= Yes
VERSION= 0.3.5
DISTNAME= smpeg-xmms-${VERSION}
PKGNAME= xmms-smpeg-${VERSION}
REVISION = 3
REVISION = 4
CATEGORIES= graphics
MAINTAINER= Wilbern Cobb <wcobb@openbsd.org>
@ -17,11 +17,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= SDL X11 Xau Xdmcp Xext Xrandr Xrender iconv m sndio \
WANTLIB= SDL X11 Xau Xdmcp Xext Xrandr Xrender m sndio \
pthread-stubs xcb usbhid xmms>=2 smpeg>=1.3
MASTER_SITES= ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/smpeg-xmms/
MODULES= converters/libiconv
LIB_DEPENDS= audio/xmms \
devel/smpeg

6
misc/lifelines/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2010/11/19 07:23:11 espie Exp $
# $OpenBSD: Makefile,v 1.9 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= genealogical database and programming system
DISTNAME= lifelines-3.0.60
REVISION= 2
REVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lifelines/}
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ncurses iconv
WANTLIB= c m ncurses
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= YACC="bison -y" \

5
misc/pdmenu/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2010/11/19 07:23:12 espie Exp $
# $OpenBSD: Makefile,v 1.20 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= simple slang-based menu program
DISTNAME= pdmenu_1.2.98
PKGNAME= ${DISTNAME:S/_/-/}
REVISION= 0
CATEGORIES= misc
HOMEPAGE= http://kitenet.net/programs/pdmenu/
@ -14,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c curses iconv m slang
WANTLIB= c curses m slang
MASTER_SITES= http://ftp.de.debian.org/debian/pool/main/p/pdmenu/

7
multimedia/dvdauthor/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2010/11/19 07:23:12 espie Exp $
# $OpenBSD: Makefile,v 1.15 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= creates DVD file structures
DISTNAME= dvdauthor-0.6.14
REVISION= 0
CATEGORIES= multimedia
HOMEPAGE= http://dvdauthor.sourceforge.net/
@ -14,12 +15,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
MODULES= converters/libiconv
LIB_DEPENDS= devel/libdvdread \
devel/fribidi \
textproc/libxml \
graphics/ImageMagick
WANTLIB += c freetype iconv m png z dvdread fribidi xml2 MagickCore MagickWand
WANTLIB += c freetype m png z dvdread fribidi xml2 MagickCore MagickWand
USE_GMAKE= Yes
USE_GROFF= Yes

8
multimedia/ffmpeg-php/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2011/06/24 11:17:05 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2011/07/07 01:06:59 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= PHP support for ffmpeg
DISTNAME= ffmpeg-php-0.6.0
REVISION= 5
REVISION= 6
EXTRACT_SUFX= .tbz2
CATEGORIES= multimedia www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg-php/}
@ -27,6 +27,8 @@ NO_REGRESS= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
MODULES= converters/libiconv
BUILD_DEPENDS= www/pear \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@ -36,7 +38,7 @@ RUN_DEPENDS= www/php5/core \
www/php5/extensions,-gd
WANTLIB += avcodec avformat avutil bz2 expat fontconfig freetype gd
WANTLIB += gsm iconv jpeg m mp3lame ogg orc-0.4 png schroedinger-1.0
WANTLIB += gsm jpeg m mp3lame ogg orc-0.4 png schroedinger-1.0
WANTLIB += speex swscale theoradec theoraenc vorbis vorbisenc
WANTLIB += vpx x264 z

8
multimedia/ffmpeg2theora/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2011/06/24 11:17:05 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= reencode many media file formats to Ogg Theora
N= ffmpeg2theora
DISTNAME= ${N}-0.27
REVISION= 3
REVISION= 4
CATEGORIES= multimedia
EXTRACT_SUFX= .tar.bz2
@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xext Xfixes avcodec avdevice avformat avutil bz2
WANTLIB += c gsm iconv m mp3lame ogg orc-0.4 postproc pthread
WANTLIB += c gsm m mp3lame ogg orc-0.4 postproc pthread
WANTLIB += schroedinger-1.0 sndio speex swscale theoradec theoraenc
WANTLIB += vorbis vorbisenc vpx x264 z
@ -27,7 +27,7 @@ LIB_DEPENDS= graphics/ffmpeg>=20080620p10 \
audio/libvorbis \
multimedia/libtheora
MODULES= devel/scons
MODULES= devel/scons converters/libiconv
MODSCONS_FLAGS= libkate=0
USE_GROFF= Yes

7
net/ezstream/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2011/01/16 20:01:22 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= streaming source client that uses external en-/decoders
DISTNAME= ezstream-0.5.6
REVISION= 0
CATEGORIES= net multimedia
HOMEPAGE= http://www.icecast.org/ezstream.php
@ -13,11 +14,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c iconv m ogg pthread theora vorbis \
WANTLIB= c m ogg pthread theora vorbis \
shout>=3 speex>=4 xml2>=9 tag_c>=1
MASTER_SITES= http://downloads.xiph.org/releases/ezstream/
MODULES= converters/libiconv
LIB_DEPENDS= net/libshout \
audio/speex \
textproc/libxml \

8
net/xmlrpc-epi/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:39 espie Exp $
# $OpenBSD: Makefile,v 1.10 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
DISTNAME= xmlrpc-epi-0.51
REVISION= 1
REVISION= 2
SHARED_LIBS += xmlrpc-epi 0.3
HOMEPAGE= http://xmlrpc-epi.sourceforge.net/
WANTLIB += c expat iconv
WANTLIB += c expat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-epi/}
@ -19,6 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
MODULES= converters/libiconv
BUILD_DEPENDS += devel/gettext
RUN_DEPENDS += devel/gettext

9
security/rarcrack/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2010/11/20 17:22:45 espie Exp $
# $OpenBSD: Makefile,v 1.5 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= rar, 7zip and zip password bruteforcer
DISTNAME= rarcrack-0.2
REVISION = 0
REVISION = 1
CATEGORIES= security
HOMEPAGE= http://rarcrack.sourceforge.net/
@ -16,7 +16,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread z iconv xml2
WANTLIB= c m pthread z xml2
MODULES= converters/libiconv
LIB_DEPENDS= textproc/libxml
RUN_DEPENDS= archivers/p7zip \

12
x11/xbae/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2011/04/10 18:02:55 jasper Exp $
# $OpenBSD: Makefile,v 1.15 2011/07/07 01:06:59 ajacoutot Exp $
COMMENT= Motif-based table widget
DISTNAME= xbae-4.60.4
REVISION= 8
REVISION= 9
SHARED_LIBS= Xbae 4.60
@ -20,11 +20,13 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xpm Xrender Xt jpeg m png
WANTLIB += expat fontconfig freetype z iconv pthread-stubs xcb Xm
WANTLIB += expat fontconfig freetype z pthread-stubs xcb Xm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xbae/}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xbae/}
USE_LIBTOOL= Yes
MODULES= converters/libiconv
USE_LIBTOOL= Yes
LIB_DEPENDS+= x11/openmotif
USE_GROFF = Yes
CONFIGURE_STYLE= gnu