Allow portbump tests to run after quiet a few changes in ports.
This commit is contained in:
parent
5d2f751367
commit
e54f247a4e
|
@ -1,4 +1,4 @@
|
|||
# $OpenBSD: Makefile,v 1.6 2016/11/06 14:59:28 zhuk Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2018/06/27 16:18:56 zhuk Exp $
|
||||
|
||||
# To add a test named ${testname}:
|
||||
# 1) Create test port directory with ${testname} name.
|
||||
|
@ -7,7 +7,7 @@
|
|||
# 3) Add the test to REGRESS_TARGETS.
|
||||
|
||||
# user-customizeable
|
||||
REGRESS_TARGETS ?= t1 t2 t3 t4 t5 t6 t7 t8 t9
|
||||
REGRESS_TARGETS ?= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10
|
||||
PORTBUMP ?= ${PORTSDIR}/infrastructure/bin/portbump
|
||||
PORTBUMP_ARGS ?=
|
||||
DIFF ?= diff -u
|
||||
|
@ -18,6 +18,7 @@ TEST_t4_ARGS = -d
|
|||
TEST_t5_ARGS = -W qwe
|
||||
TEST_t6_ARGS = -l
|
||||
TEST_t7_ARGS = -l
|
||||
TEST_t10_ARGS = -- -main
|
||||
|
||||
# define tests
|
||||
.for _t in ${REGRESS_TARGETS}
|
||||
|
@ -31,7 +32,7 @@ CLEANFILES += ${TEST_${_t}_RESULT}
|
|||
${_t}:
|
||||
@echo '=> ${_t}'
|
||||
.if ${TEST_${_t}_ARGS:M-l}
|
||||
cd ${TEST_${_t}_DIR}; make fake
|
||||
cd ${TEST_${_t}_DIR}; make clean fake
|
||||
.endif
|
||||
cd ${TEST_${_t}_DIR}; ${PORTBUMP} -o ${TEST_${_t}_RESULT} ${TEST_${_t}_ARGS}
|
||||
@${DIFF} ${TEST_${_t}_SAMPLE} ${TEST_${_t}_RESULT}
|
||||
|
|
|
@ -55,17 +55,14 @@ FLAVOR?= no_gui no_mono no_qt3 no_qt4 bootstrap
|
|||
|
||||
MULTI_PACKAGES= -main -mono -qt3 -qt4 -gui -gtk -gtk3 -ui
|
||||
|
||||
MODULES= devel/gettext \
|
||||
textproc/intltool
|
||||
MODULES= textproc/intltool
|
||||
|
||||
BUILD_DEPENDS= converters/xmltoman \
|
||||
devel/gobject-introspection \
|
||||
|
||||
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
|
||||
gdbm daemon dbus-1 ffi \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/glib2 \
|
||||
gdbm daemon dbus-1 ffi
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
databases/gdbm \
|
||||
devel/libdaemon>=0.14 \
|
||||
x11/dbus
|
||||
|
@ -100,11 +97,9 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
|||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+2 \
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
|
||||
|
@ -112,16 +107,13 @@ WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
|||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render avahi-client avahi-common xcb-shm \
|
||||
avahi-glib ffi harfbuzz graphite2 \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
avahi-glib ffi harfbuzz graphite2
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+3 \
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk3 += X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
|
||||
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
|
||||
|
@ -129,15 +121,13 @@ WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
|
|||
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
|
||||
WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-gtk3 += xcb-shm z ffi
|
||||
WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gtk3 += graphite2
|
||||
|
||||
### -gui
|
||||
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODPY_RUN_DEPENDS} \
|
||||
LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \
|
||||
lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/py-gtk2 \
|
||||
x11/dbus-python \
|
||||
|
@ -153,7 +143,6 @@ WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
|||
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
|
||||
WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gui += graphite2
|
||||
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
|
||||
|
||||
### -ui
|
||||
LIB_DEPENDS-ui= # empty
|
||||
|
@ -171,13 +160,12 @@ CONFIGURE_ARGS+= --disable-gtk \
|
|||
.if ${BUILD_PACKAGES:M-qt3}
|
||||
SHARED_LIBS += avahi-qt3 0.0 # .1.2
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
LIB_DEPENDS-qt3= ${MODQT3_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt3= GL ICE SM X11 Xcursor Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread xcb z \
|
||||
avahi-common stdc++ ${MODQT3_WANTLIB} ${MODGETTEXT_WANTLIB} \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} \
|
||||
Xdamage Xxf86vm drm pthread-stubs
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
|
@ -186,10 +174,9 @@ CONFIGURE_ARGS+= --disable-qt3
|
|||
.if ${BUILD_PACKAGES:M-qt4}
|
||||
SHARED_LIBS += avahi-qt4 0.0 # .1.2
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/qt4 \
|
||||
LIB_DEPENDS-qt4= x11/qt4 \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt4= QtCore avahi-common m stdc++ ${MODGETTEXT_WANTLIB} \
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} \
|
||||
pthread
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
|
|
|
@ -53,17 +53,14 @@ FLAVOR?= no_gui no_mono no_qt3 no_qt4 bootstrap
|
|||
|
||||
MULTI_PACKAGES= -main -mono -qt3 -qt4 -gui -gtk -gtk3 -ui
|
||||
|
||||
MODULES= devel/gettext \
|
||||
textproc/intltool
|
||||
MODULES= textproc/intltool
|
||||
|
||||
BUILD_DEPENDS= converters/xmltoman \
|
||||
devel/gobject-introspection \
|
||||
|
||||
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
|
||||
gdbm daemon dbus-1 ffi \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/glib2 \
|
||||
gdbm daemon dbus-1 ffi
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
databases/gdbm \
|
||||
devel/libdaemon>=0.14 \
|
||||
x11/dbus
|
||||
|
@ -98,11 +95,9 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
|||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+2 \
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
|
||||
|
@ -110,16 +105,13 @@ WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
|||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render avahi-client avahi-common xcb-shm \
|
||||
avahi-glib ffi harfbuzz graphite2 \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
avahi-glib ffi harfbuzz graphite2
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+3 \
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk3 += X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
|
||||
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
|
||||
|
@ -127,15 +119,13 @@ WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
|
|||
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
|
||||
WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-gtk3 += xcb-shm z ffi
|
||||
WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gtk3 += graphite2
|
||||
|
||||
### -gui
|
||||
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODPY_RUN_DEPENDS} \
|
||||
LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \
|
||||
lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/py-gtk2 \
|
||||
x11/dbus-python \
|
||||
|
@ -151,7 +141,6 @@ WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
|||
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
|
||||
WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gui += graphite2
|
||||
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
|
||||
|
||||
### -ui
|
||||
LIB_DEPENDS-ui= # empty
|
||||
|
@ -169,13 +158,12 @@ CONFIGURE_ARGS+= --disable-gtk \
|
|||
.if ${BUILD_PACKAGES:M-qt3}
|
||||
SHARED_LIBS += avahi-qt3 0.0 # .1.2
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
LIB_DEPENDS-qt3= ${MODQT3_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt3= GL ICE SM X11 Xcursor Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread xcb z \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} ${MODGETTEXT_WANTLIB} \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} \
|
||||
Xdamage Xxf86vm drm pthread-stubs
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
|
@ -184,10 +172,9 @@ CONFIGURE_ARGS+= --disable-qt3
|
|||
.if ${BUILD_PACKAGES:M-qt4}
|
||||
SHARED_LIBS += avahi-qt4 0.0 # .1.2
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/qt4 \
|
||||
LIB_DEPENDS-qt4= x11/qt4 \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} ${MODGETTEXT_WANTLIB} \
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} \
|
||||
pthread
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
|
|
|
@ -13,7 +13,7 @@ SUHOSIN_P_V= 0.9.10unofficial
|
|||
REVISION= 4
|
||||
REVISION-main= 7
|
||||
REVISION-odbc= 5
|
||||
REVISION-fpm= 0
|
||||
REVISION-fpm= 5
|
||||
|
||||
SHARED_LIBS = \
|
||||
foooo 0.0
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $OpenBSD: Makefile.inc,v 1.7 2017/07/16 19:19:02 espie Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.8 2018/06/27 16:18:56 zhuk Exp $
|
||||
|
||||
COMMENT-main= server-side HTML-embedded scripting language
|
||||
COMMENT-fastcgi= stand-alone FastCGI version of PHP
|
||||
|
@ -308,14 +308,11 @@ PHP_VERSION= ${V}
|
|||
PHPXS_SUBST+= -e 's,${i},${${i}},'
|
||||
.endfor
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
WANTLIB-main+= c crypto m pthread ssl xml2>=8 z ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-main+= c crypto m pthread ssl xml2>=8 z
|
||||
# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
|
||||
WANTLIB-fastcgi= ${WANTLIB-main}
|
||||
LIB_DEPENDS-main= textproc/libxml
|
||||
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
mail/femail,-chroot
|
||||
RUN_DEPENDS-main= mail/femail,-chroot
|
||||
LIB_DEPENDS-fastcgi= ${LIB_DEPENDS-main}
|
||||
|
||||
.if ${PV} != "5.4" && ${PV} != "5.5"
|
||||
|
|
|
@ -28,8 +28,7 @@ WANTLIB += tracker-sparql-${TRACKER_VERSION}
|
|||
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data
|
||||
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common
|
||||
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome \
|
||||
MODULES= x11/gnome \
|
||||
devel/dconf
|
||||
|
||||
RUN_DEPENDS= x11/gnome/gvfs \
|
||||
|
|
|
@ -27,8 +27,7 @@ WANTLIB += tracker-sparql-${TRACKER_VERSION}
|
|||
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data
|
||||
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common
|
||||
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome \
|
||||
MODULES= x11/gnome \
|
||||
devel/dconf
|
||||
|
||||
RUN_DEPENDS= x11/gnome/gvfs \
|
||||
|
|
|
@ -47,17 +47,14 @@ FLAVOR?= no_gui no_mono no_qt3 no_qt4 bootstrap
|
|||
|
||||
MULTI_PACKAGES= -main -mono -qt3 -qt4 -gui -gtk -gtk3 -ui
|
||||
|
||||
MODULES= devel/gettext \
|
||||
textproc/intltool
|
||||
MODULES= textproc/intltool
|
||||
|
||||
BUILD_DEPENDS= converters/xmltoman \
|
||||
devel/gobject-introspection \
|
||||
|
||||
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
|
||||
gdbm daemon dbus-1 ffi \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/glib2 \
|
||||
gdbm daemon dbus-1 ffi
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
databases/gdbm \
|
||||
devel/libdaemon>=0.14 \
|
||||
x11/dbus
|
||||
|
@ -92,11 +89,9 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
|||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+2 \
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
|
||||
|
@ -104,16 +99,13 @@ WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
|||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render avahi-client avahi-common xcb-shm \
|
||||
avahi-glib ffi harfbuzz graphite2 \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
avahi-glib ffi harfbuzz graphite2
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+3 \
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk3 += X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
|
||||
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
|
||||
|
@ -121,15 +113,13 @@ WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
|
|||
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
|
||||
WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-gtk3 += xcb-shm z ffi
|
||||
WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gtk3 += graphite2
|
||||
|
||||
### -gui
|
||||
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODPY_RUN_DEPENDS} \
|
||||
LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \
|
||||
lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/py-gtk2 \
|
||||
x11/dbus-python \
|
||||
|
@ -145,7 +135,6 @@ WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
|||
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
|
||||
WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gui += graphite2
|
||||
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
|
||||
|
||||
### -ui
|
||||
LIB_DEPENDS-ui= # empty
|
||||
|
@ -163,13 +152,12 @@ CONFIGURE_ARGS+= --disable-gtk \
|
|||
.if ${BUILD_PACKAGES:M-qt3}
|
||||
SHARED_LIBS += avahi-qt3 0.0 # .1.2
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
LIB_DEPENDS-qt3= ${MODQT3_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt3= GL ICE SM X11 Xcursor Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread xcb z \
|
||||
avahi-common stdc++ ${MODQT3_WANTLIB} ${MODGETTEXT_WANTLIB} \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} \
|
||||
Xdamage Xxf86vm drm pthread-stubs
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
|
@ -178,10 +166,9 @@ CONFIGURE_ARGS+= --disable-qt3
|
|||
.if ${BUILD_PACKAGES:M-qt4}
|
||||
SHARED_LIBS += avahi-qt4 0.0 # .1.2
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/qt4 \
|
||||
LIB_DEPENDS-qt4= x11/qt4 \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt4= QtCore avahi-common m stdc++ ${MODGETTEXT_WANTLIB} \
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} \
|
||||
pthread
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
|
|
|
@ -53,17 +53,14 @@ FLAVOR?= no_gui no_mono no_qt3 no_qt4 bootstrap
|
|||
|
||||
MULTI_PACKAGES= -main -mono -qt3 -qt4 -gui -gtk -gtk3 -ui
|
||||
|
||||
MODULES= devel/gettext \
|
||||
textproc/intltool
|
||||
MODULES= textproc/intltool
|
||||
|
||||
BUILD_DEPENDS= converters/xmltoman \
|
||||
devel/gobject-introspection \
|
||||
|
||||
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
|
||||
gdbm daemon dbus-1 ffi \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/glib2 \
|
||||
gdbm daemon dbus-1 ffi
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
databases/gdbm \
|
||||
devel/libdaemon>=0.14 \
|
||||
x11/dbus
|
||||
|
@ -98,11 +95,9 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
|||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+2 \
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
|
||||
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
|
||||
|
@ -110,16 +105,13 @@ WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
|||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render avahi-client avahi-common xcb-shm \
|
||||
avahi-glib ffi harfbuzz graphite2 \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
avahi-glib ffi harfbuzz graphite2
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+3 \
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
WANTLIB-gtk3 += X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
|
||||
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
|
||||
|
@ -127,15 +119,13 @@ WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
|
|||
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
|
||||
WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-gtk3 += xcb-shm z ffi
|
||||
WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gtk3 += graphite2
|
||||
|
||||
### -gui
|
||||
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODPY_RUN_DEPENDS} \
|
||||
LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \
|
||||
lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/py-gtk2 \
|
||||
x11/dbus-python \
|
||||
|
@ -151,7 +141,6 @@ WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
|||
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
|
||||
WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gui += graphite2
|
||||
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
|
||||
|
||||
### -ui
|
||||
LIB_DEPENDS-ui= # empty
|
||||
|
@ -169,13 +158,12 @@ CONFIGURE_ARGS+= --disable-gtk \
|
|||
.if ${BUILD_PACKAGES:M-qt3}
|
||||
SHARED_LIBS += avahi-qt3 0.0 # .1.2
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
LIB_DEPENDS-qt3= ${MODQT3_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt3= GL ICE SM X11 Xcursor Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread xcb z \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} ${MODGETTEXT_WANTLIB} \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} \
|
||||
Xdamage Xxf86vm drm pthread-stubs
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
|
@ -184,10 +172,9 @@ CONFIGURE_ARGS+= --disable-qt3
|
|||
.if ${BUILD_PACKAGES:M-qt4}
|
||||
SHARED_LIBS += avahi-qt4 0.0 # .1.2
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/qt4 \
|
||||
LIB_DEPENDS-qt4= x11/qt4 \
|
||||
${BUILD_PKGPATH}
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} ${MODGETTEXT_WANTLIB} \
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} \
|
||||
pthread
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
|
|
|
@ -24,6 +24,8 @@ PKGNAME-qt3= avahi-qt3-${V}
|
|||
PKGNAME-qt4= avahi-qt4-${V}
|
||||
PKGNAME-ui= avahi-ui-${V}
|
||||
|
||||
PKG_ARCH-ui= *
|
||||
|
||||
REVISION-main= 10
|
||||
REVISION-gtk= 5
|
||||
REVISION-mono= 2
|
||||
|
@ -79,18 +81,16 @@ WANTLIB-gui += gtk-3 harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
|||
WANTLIB-gui += pcre pixman-1 png pthread pthread-stubs qwe xcb
|
||||
WANTLIB-gui += xcb-render xcb-shm z
|
||||
|
||||
WANTLIB-mono= qwe
|
||||
|
||||
WANTLIB-qt3= ${MODQT3_WANTLIB}
|
||||
WANTLIB-qt3+= GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
|
||||
WANTLIB-qt3+= Xmu Xrandr Xrender Xt Xxf86vm avahi-common drm expat
|
||||
WANTLIB-qt3+= fontconfig freetype jpeg lcms m mng png pthread
|
||||
WANTLIB-qt3+= pthread-stubs qwe stdc++ xcb z
|
||||
WANTLIB-qt3+= pthread-stubs qwe ${COMPILER_LIBCXX} xcb z
|
||||
|
||||
WANTLIB-qt4= ${MODQT4_WANTLIB}
|
||||
WANTLIB-qt4+= avahi-common m pthread qwe stdc++
|
||||
WANTLIB-qt4+= avahi-common m pthread qwe ${COMPILER_LIBCXX}
|
||||
|
||||
WANTLIB-ui= qwe
|
||||
WANTLIB-ui = # no-arch package
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}/download/
|
||||
|
||||
|
@ -213,8 +213,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
|
|||
PTHREAD_CFLAGS="-pthread" \
|
||||
PTHREAD_LIBS="-pthread" \
|
||||
PYTHON="${MODPY_BIN}"
|
||||
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
|
||||
--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \
|
||||
CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \
|
||||
--with-avahi-user=_avahi \
|
||||
--with-avahi-group=_avahi \
|
||||
--with-avahi-priv-access-group=wheel \
|
||||
|
|
|
@ -24,6 +24,8 @@ PKGNAME-qt3= avahi-qt3-${V}
|
|||
PKGNAME-qt4= avahi-qt4-${V}
|
||||
PKGNAME-ui= avahi-ui-${V}
|
||||
|
||||
PKG_ARCH-ui= *
|
||||
|
||||
REVISION-main= 10
|
||||
REVISION-gtk= 5
|
||||
REVISION-mono= 2
|
||||
|
@ -53,17 +55,14 @@ FLAVOR?= no_gui no_mono no_qt3 no_qt4 bootstrap
|
|||
|
||||
MULTI_PACKAGES= -main -mono -qt3 -qt4 -gui -gtk -gtk3 -ui
|
||||
|
||||
MODULES= devel/gettext \
|
||||
textproc/intltool
|
||||
MODULES= textproc/intltool
|
||||
|
||||
BUILD_DEPENDS= converters/xmltoman \
|
||||
devel/gobject-introspection \
|
||||
|
||||
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
|
||||
gdbm daemon dbus-1 ffi \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/glib2 \
|
||||
gdbm daemon dbus-1 ffi
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
databases/gdbm \
|
||||
devel/libdaemon>=0.14 \
|
||||
x11/dbus
|
||||
|
@ -96,8 +95,7 @@ WANTLIB-gtk= X11 Xcomposite Xcursor Xdamage Xext Xfixes \
|
|||
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb z \
|
||||
xcb-render avahi-client avahi-common xcb-shm \
|
||||
avahi-glib ffi harfbuzz graphite2 \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
avahi-glib ffi harfbuzz graphite2
|
||||
|
||||
WANTLIB-gtk3 += X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender atk-1.0 avahi-client
|
||||
|
@ -106,7 +104,7 @@ WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
|
|||
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
|
||||
WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-gtk3 += xcb-shm z ffi
|
||||
WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gtk3 += graphite2
|
||||
|
||||
|
@ -120,7 +118,6 @@ WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
|||
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
|
||||
WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
|
||||
WANTLIB-gui += graphite2
|
||||
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
|
||||
|
||||
WANTLIB-ui= # empty
|
||||
|
||||
|
@ -133,25 +130,19 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
|||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+2 \
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/gtk+3 \
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BUILD_PKGPATH},-ui
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
|
||||
### -gui
|
||||
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODPY_RUN_DEPENDS} \
|
||||
LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3
|
||||
RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \
|
||||
lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/py-gtk2 \
|
||||
x11/dbus-python \
|
||||
|
@ -173,27 +164,25 @@ CONFIGURE_ARGS+= --disable-gtk \
|
|||
WANTLIB-qt3= GL ICE SM X11 Xcursor Xext Xfixes Xft Xi \
|
||||
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
|
||||
freetype jpeg lcms m mng png pthread xcb z \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} ${MODGETTEXT_WANTLIB} \
|
||||
avahi-common ${COMPILER_LIBCXX} ${MODQT3_WANTLIB} \
|
||||
Xdamage Xxf86vm drm pthread-stubs
|
||||
|
||||
.if ${BUILD_PACKAGES:M-qt3}
|
||||
SHARED_LIBS += avahi-qt3 0.0 # .1.2
|
||||
MODULES+= x11/qt3
|
||||
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
${MODQT3_LIB_DEPENDS} \
|
||||
LIB_DEPENDS-qt3= ${MODQT3_LIB_DEPENDS} \
|
||||
${BUILD_PKGPATH}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt3
|
||||
.endif
|
||||
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} ${MODGETTEXT_WANTLIB} \
|
||||
WANTLIB-qt4= QtCore avahi-common m ${COMPILER_LIBCXX} \
|
||||
pthread
|
||||
|
||||
.if ${BUILD_PACKAGES:M-qt4}
|
||||
SHARED_LIBS += avahi-qt4 0.0 # .1.2
|
||||
MODULES+= x11/qt4
|
||||
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
|
||||
x11/qt4 \
|
||||
LIB_DEPENDS-qt4= x11/qt4 \
|
||||
${BUILD_PKGPATH}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-qt4
|
||||
|
|
|
@ -6,7 +6,9 @@ PKGNAME = portbump-t7-1.0
|
|||
PKGNAME-main = ${PKGNAME}
|
||||
PKGNAME-qt4 = portbump-t7-qt4-1.0
|
||||
|
||||
WANTLIB-main = c m pthread
|
||||
WANTLIB = c pthread
|
||||
|
||||
WANTLIB-main = ${WANTLIB} m
|
||||
|
||||
WANTLIB-qt4 = ${MODQT4_WANTLIB}
|
||||
WANTLIB-qt4 += c pthread
|
||||
|
|
Loading…
Reference in New Issue
Block a user