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

replace gettext module; ok sthen@

Browse Source
This commit is contained in:
naddy 2017-11-02 21:51:59 +00:00
parent 7726219aa6
commit 1a25fa682d
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/iodbc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2017/10/23 17:10:38 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2017/11/02 21:51:59 naddy Exp $
COMMENT-main= ODBC 3.x driver manager
COMMENT-admin= ODBC 3.x driver manager admin application
@ -9,7 +9,8 @@ DISTNAME= libiodbc-$V
PKGNAME= iodbc-$V
PKGNAME-main= iodbc-$V
PKGNAME-admin= iodbc-admin-$V
REVISION-admin= 0
REVISION-main= 0
REVISION-admin= 1
CATEGORIES= databases
@ -27,8 +28,6 @@ PERMIT_PACKAGE_CDROM= yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iodbc/}
MODULES= devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-iodbc-inidir="${SYSCONFDIR}/iodbc" \
--disable-libodbc
@ -37,18 +36,16 @@ MULTI_PACKAGES= -main -admin
WANTLIB-main= c pthread
LIB_DEPENDS-admin= ${MODGETTEXT_LIB_DEPENDS} \
databases/iodbc,-main \
LIB_DEPENDS-admin= databases/iodbc,-main \
x11/gtk+2
LIB_DEPENDS-main= # empty
WANTLIB-admin= ${MODGETTEXT_WANTLIB}
WANTLIB-admin += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB-admin += Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig
WANTLIB-admin += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB-admin += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
WANTLIB-admin += harfbuzz iodbc iodbcinst m pango-1.0 pangocairo-1.0
WANTLIB-admin += harfbuzz iconv intl iodbc iodbcinst m pango-1.0 pangocairo-1.0
WANTLIB-admin += pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB-admin += xcb xcb-render xcb-shm z

14
net/rrdtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.105 2017/11/01 10:18:18 jeremy Exp $
# $OpenBSD: Makefile,v 1.106 2017/11/02 21:51:59 naddy Exp $
COMMENT-main= system to store and display time-series data
COMMENT-update= lightweight update-only tool for rrdtool
@ -13,6 +13,7 @@ PKGNAME-update= rrdupdate-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
PKGNAME-ruby= ruby${MODRUBY_BINREV}-rrd-${VERSION}
REVISION-main= 1
REVISION-update= 0
SHARED_LIBS += rrd 5.2 # 9.0
@ -32,7 +33,7 @@ USE_GMAKE= Yes
PSEUDO_FLAVORS= no_ruby no_python
MULTI_PACKAGES= -main -python -ruby -update
MODULES= devel/gettext lang/python lang/ruby
MODULES= lang/python lang/ruby
MODPY_SETUPTOOLS= Yes
CONFIGURE_STYLE= gnu
@ -75,14 +76,14 @@ CONFIGURE_ENV+= NROFF="/usr/bin/true" \
TROFF="/usr/bin/true"
cWANTLIB= pthread
WANTLIB-update= ${cWANTLIB} ${MODGETTEXT_WANTLIB} c glib-2.0 m pcre
WANTLIB-update= ${cWANTLIB} c glib-2.0 iconv intl m pcre
WANTLIB-python= ${cWANTLIB} ${MODPY_WANTLIB} rrd
WANTLIB-ruby= ${cWANTLIB} ${MODRUBY_WANTLIB} c gmp m rrd
# depends on Perl ABI
WANTLIB-main= ${cWANTLIB} ${MODGETTEXT_WANTLIB} perl
WANTLIB-main= ${cWANTLIB} perl
WANTLIB-main += X11 Xext Xrender c cairo expat ffi fontconfig freetype
WANTLIB-main += glib-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB-main += harfbuzz lzma m pango-1.0 pangocairo-1.0
WANTLIB-main += harfbuzz iconv intl lzma m pango-1.0 pangocairo-1.0
WANTLIB-main += pangoft2-1.0 pcre pixman-1 png xcb
WANTLIB-main += xcb-render xcb-shm xml2 z
@ -92,8 +93,7 @@ LIB_DEPENDS-main= devel/glib2 \
textproc/libxml
RUN_DEPENDS-main= rrdupdate-${VERSION}:net/rrdtool,-update
LIB_DEPENDS-update= ${MODGETTEXT_LIB_DEPENDS} \
devel/glib2 \
LIB_DEPENDS-update= devel/glib2 \
devel/pcre
RUN_DEPENDS-update=

15
sysutils/nut/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.95 2017/07/26 22:45:30 sthen Exp $
# $OpenBSD: Makefile,v 1.96 2017/11/02 21:51:59 naddy Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
@ -14,8 +14,8 @@ PKGNAME-xml= ${DISTNAME:S/-/-xml-/}
REVISION-main= 2
REVISION-snmp= 1
REVISION-xml= 1
REVISION-cgi= 0
REVISION-xml= 2
REVISION-cgi= 1
SHARED_LIBS += upsclient 4.0 # .4.0
SHARED_LIBS += nutclient 0.0 # .0.0
@ -31,15 +31,14 @@ PERMIT_PACKAGE_CDROM= Yes
COMMON += c crypto pthread
WANTLIB-main += ${COMMON} ltdl m ssl ${COMPILER_LIBCXX} usb usb-1.0
WANTLIB-xml += ${COMMON} ${MODGETTEXT_WANTLIB} expat neon proxy ssl z
WANTLIB-cgi += ${COMMON} ${MODGETTEXT_WANTLIB} X11 expat fontconfig
WANTLIB-xml += ${COMMON} expat iconv intl neon proxy ssl z
WANTLIB-cgi += ${COMMON} X11 expat fontconfig iconv intl
WANTLIB-cgi += freetype gd jpeg m png ssl upsclient xcb z
WANTLIB-snmp += ${COMMON} m netsnmp
MASTER_SITES= ${HOMEPAGE}source/2.7/
MODULES= devel/gettext \
lang/python
MODULES= lang/python
MODPY_RUNDEP= No
# if avahi is present at build time, avahi support is built in nut-scanner,
# but it's dlopen()'d at runtime, so support is optional, so we don't list a
@ -97,7 +96,7 @@ RUN_DEPENDS-xml= ${RUN_DEPENDS} \
LIB_DEPENDS-snmp= net/net-snmp
RUN_DEPENDS-snmp= sysutils/nut
LIB_DEPENDS-cgi= ${LIB_DEPENDS} \
LIB_DEPENDS-cgi= devel/gettext \
graphics/jpeg \
graphics/gd \
sysutils/nut