diff --git a/net/irssi/Makefile b/net/irssi/Makefile index fec22a6d423..bd1e9774b57 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2010/11/19 22:31:34 espie Exp $ +# $OpenBSD: Makefile,v 1.48 2010/11/22 09:34:10 espie Exp $ SHARED_ONLY= Yes @@ -42,7 +42,7 @@ FLAVOR?= .if ${FLAVOR:L:Msocks} CONFIGURE_ARGS+= --with-socks -BUILD_DEPENDS+= ::security/dante +BUILD_DEPENDS+= security/dante .endif MAKE_FLAGS= scriptdir="${SYSCONFDIR}/irssi/scripts" \ diff --git a/print/acroread/Makefile b/print/acroread/Makefile index 636e5296d73..650a24dc005 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2010/11/20 09:48:39 espie Exp $ +# $OpenBSD: Makefile,v 1.38 2010/11/22 09:34:10 espie Exp $ ONLY_FOR_ARCHS= i386 SHARED_ONLY= Yes @@ -35,7 +35,7 @@ MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/ RUN_DEPENDS= emulators/fedora/base \ devel/desktop-file-utils -RUN_DEPENDS-plugins= ${RUN_DEPENDS} :${PKGNAME-main}:print/acroread +RUN_DEPENDS-plugins= ${RUN_DEPENDS} ${PKGNAME-main}:print/acroread WRKDIST= ${WRKDIR}/AdobeReader NO_BUILD= Yes diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile index 7ddbf340a28..06c9ba88e98 100644 --- a/print/ghostscript/gnu/Makefile +++ b/print/ghostscript/gnu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.80 2010/11/20 09:48:39 espie Exp $ +# $OpenBSD: Makefile,v 1.81 2010/11/22 09:34:10 espie Exp $ COMMENT= GNU PostScript interpreter @@ -28,7 +28,7 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -WANTLIB= c ijs m jpeg.>=62 png.>=6 pthread z +WANTLIB= c ijs m jpeg>=62 png>=6 pthread z MODULES= converters/libiconv @@ -115,12 +115,12 @@ CFLAGS+= -DA4 .if ${FLAVOR:L:Mgtk} && ${FLAVOR:L:Mno_x11} ERRORS+= "Fatal: Conflicting flavors: ${FLAVOR}" .elif ${FLAVOR:L:Mgtk} -LIB_DEPENDS+= ::x11/gtk+2 +LIB_DEPENDS+= x11/gtk+2 MODULES+= devel/gettext WANTLIB+= Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama WANTLIB+= Xrandr Xrender atk-1.0 cairo expat fontconfig freetype -WANTLIB+= gdk-x11-2.0.>=1000 gdk_pixbuf-2.0.>=1000 gio-2.0 glib-2.0 -WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0.>=1000 +WANTLIB+= gdk-x11-2.0>=1000 gdk_pixbuf-2.0>=1000 gio-2.0 glib-2.0 +WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0>=1000 WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs WANTLIB+= xcb xcb-render xcb-render-util NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index 79a2c71d431..3b8bf02ed31 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/20 17:22:43 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/22 09:34:10 espie Exp $ COMMENT = gnu privacy guard - a free PGP replacement @@ -54,7 +54,7 @@ CONFIGURE_ARGS += --disable-ldap RUN_DEPENDS = security/pinentry # gpg-agent must be installed to run the regress tests -REGRESS_DEPENDS = :${PKGNAME}:${BUILD_PKGPATH} +REGRESS_DEPENDS = ${PKGNAME}:${BUILD_PKGPATH} USE_GMAKE = Yes USE_GROFF = Yes diff --git a/security/hydra/Makefile b/security/hydra/Makefile index 046e7b5c224..33b50017aad 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2010/11/06 16:07:00 espie Exp $ +# $OpenBSD: Makefile,v 1.42 2010/11/22 09:34:10 espie Exp $ COMMENT-main= parallelized login hacker COMMENT-gui= GTK frontend for hydra @@ -54,9 +54,9 @@ post-configure: LIB_DEPENDS-main= RUN_DEPENDS-main= WANTLIB-main= c m ssl crypto -LIB_DEPENDS-gui=::x11/gtk+2 \ +LIB_DEPENDS-gui=x11/gtk+2 \ ${MODGETTEXT_LIB_DEPENDS} -RUN_DEPENDS-gui=:hydra-${VERSION}:security/hydra,-main \ +RUN_DEPENDS-gui=hydra-${VERSION}:security/hydra,-main \ ${MODGETTEXT_RUN_DEPENDS} WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \ Xext Xi Xinerama Xrandr Xrender atk-1.0 freetype fontconfig \ diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 80bdc6b7079..18349142f08 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/22 09:34:10 espie Exp $ COMMENT= portable, encrypted, compressed tunnel @@ -28,7 +28,7 @@ DEFINES_openbsd= -DHAVE_PTHREADS -DBUGGY_FORK_WITH_THREADS OSLIBS_openbsd= -pthread USE_GROFF = Yes -BUILD_DEPENDS= ::archivers/bzip2 +BUILD_DEPENDS= archivers/bzip2 .if ${FLAVOR:L:Mudp_spoof} WANTLIB += lib/libnet-1.0/net=0 diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile index 36ea9d9924d..3e09928ac6a 100644 --- a/sysutils/dvd+rw-tools/Makefile +++ b/sysutils/dvd+rw-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/20 17:22:40 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/22 09:34:10 espie Exp $ COMMENT= mastering tools for DVD+RW/+R/-R/-RW @@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}tools/ -RUN_DEPENDS= :cdrtools->=1.10:sysutils/cdrtools +RUN_DEPENDS= sysutils/cdrtools>=1.10 WANTLIB= c m pthread stdc++ # allow growisofs to work under sudo(8)