Index: head/security/pinentry/Makefile
===================================================================
--- head/security/pinentry/Makefile	(revision 239600)
+++ head/security/pinentry/Makefile	(revision 239601)
@@ -1,100 +1,103 @@
 # New ports collection makefile for:	pinentry
 # Date created:		29 Jan 2003
 # Whom:			michaelnottebrock@gmx.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pinentry
 PORTVERSION=	0.7.6
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT?=	A collection of simple PIN or passphrase entry dialogs
 
 LIB_DEPENDS=	gcrypt.16:${PORTSDIR}/security/libgcrypt \
 		ksba.17:${PORTSDIR}/security/libksba
 
 CONFLICTS?=	pinentry-[a-z]*-[0.9]*
 
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INFO=		pinentry
 
-CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(PINENTRY_SLAVE)
 OPTIONS=	NCURSES "Curses frontend" on \
 		GTK "Gtk+1 frontend" on \
 		GTK2 "Gtk+2 frontend" on \
 		QT3 "Qt3 frontend" on \
 		QT4 "Qt4 frontend" on
 .else
 PKGNAMESUFFIX=	${PINENTRY_SLAVE}
 .endif
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_QT3)
 USE_QT_VER=	3
 PLIST_SUB+=	WITH_QT3=""
 MOC3=		${LOCALBASE}/bin/moc
 .else
 CONFIGURE_ARGS+=--disable-pinentry-qt
 PLIST_SUB+=	WITH_QT3="@comment "
 .endif
 
 .if defined(WITH_QT4)
 #USE_QT_VER=	4
 #QT_COMPONENTS=	gui moc_build
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 BUILD_DEPENDS+=	moc-qt4:${PORTSDIR}/devel/qt4-moc
 LIB_DEPENDS+=	QtGui.4:${PORTSDIR}/x11-toolkits/qt4-gui
 PLIST_SUB+=	WITH_QT4=""
 MOC4=		${LOCALBASE}/bin/moc-qt4
+LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=--disable-pinentry-qt4
 PLIST_SUB+=	WITH_QT4="@comment "
 .endif
 
 .if defined(WITH_GTK)
 USE_GNOME+=	gtk12
 PLIST_SUB+=	WITH_GTK=""
 .else
 CONFIGURE_ARGS+=--disable-pinentry-gtk
 PLIST_SUB+=	WITH_GTK="@comment "
 .endif
 
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
 CONFIGURE_ARGS+=--disable-pinentry-gtk2
 PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
 .if defined(WITH_NCURSES)
 PLIST_SUB+=	WITH_NCURSES=""
 .else
 CONFIGURE_ARGS+=--disable-pinentry-curses
 PLIST_SUB+=	WITH_NCURSES="@comment "
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
 		${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure
 .if defined(WITH_QT3)
 	${REINPLACE_CMD} -e "/^MOC/s,@MOC@,${MOC3}," \
 		${WRKSRC}/qt/Makefile.in
 .endif
 .if defined(WITH_QT4)
 	cd ${WRKSRC}/qt4 && \
 		${MOC4} pinentrydialog.h > pinentrydialog.moc && \
 		${MOC4} qsecurelineedit.h > qsecurelineedit.moc
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/security/pinentry/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.49
\ No newline at end of property
+1.50
\ No newline at end of property
Index: head/www/bookmarkbridge/Makefile
===================================================================
--- head/www/bookmarkbridge/Makefile	(revision 239600)
+++ head/www/bookmarkbridge/Makefile	(revision 239601)
@@ -1,28 +1,34 @@
 # New ports collection makefile for:	bookmarkbridge
 # Date Created:				January 2004
 # Whom:					Marco Molteni <molter@gufi.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bookmarkbridge
 PORTVERSION=	0.76
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Synchronize bookmarks between multiple browsers
 
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
 USE_PERL5_BUILD=	yes
 USE_XORG=	x11 ice xext
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui moc_build rcc_build uic_build qt3support
 USE_GNOME=	gnometarget libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:262
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700042
+QTCFGLIBS+=	${PTHREAD_LIBS}
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/www/bookmarkbridge/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property