Index: head/textproc/uim/Makefile
===================================================================
--- head/textproc/uim/Makefile	(revision 168546)
+++ head/textproc/uim/Makefile	(revision 168547)
@@ -1,120 +1,120 @@
 # New ports collection makefile for:   uim
 # Date created:        31 August 2003
 # Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	uim
 PORTVERSION=	1.1.1
 CATEGORIES?=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Input method library
 
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	gnometarget glib20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_X11)
 USE_X_PREFIX=	yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
 
 .if !defined(UIM_SLAVE)
 .if !defined(WITHOUT_X11)
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk2
 .endif
 CONFIGURE_ARGS+=	--enable-emacs
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+CONFIGURE_ENV?=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 
 .if !defined(UIM_SLAVE)
 .if !defined(WITHOUT_X11)
 MAN1=		uim-xim.1
 .endif
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
 PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 .endif
 
 .if defined(WITHOUT_X11)
 PLIST_SUB+=	X11="@comment "
 .else
 PLIST_SUB+=	X11=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-uim_editline.c
 .endif
 
 .if ${PERL_LEVEL} >= 500600
 USE_PERL5_BUILD=yes
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:${PORTSDIR}/lang/perl5
 CONFIGURE_ENV+=	INTLTOOL_PERL="${LOCALBASE}/bin/perl"
 .endif
 
 .for _x in x xft gtk2 qt gnome2 anthy canna m17nlib prime scim dict
 .if ${CONFIGURE_ARGS:M--with-${_x}} == ""
 CONFIGURE_ARGS+=--without-${_x}
 .endif
 .endfor
 .if ${CONFIGURE_ARGS:M--enable-applet} == ""
 CONFIGURE_ARGS+=--disable-applet
 .endif
 
 .if !defined(UIM_SLAVE)
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "NOTE:"
 	@${ECHO_MSG} "Optional features are splitted into the following slave ports."
 	@${ECHO_MSG} "OPTIONS variable is no longer used."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "japanese/uim-anthy"
 	@${ECHO_MSG} "japanese/uim-canna"
 	@${ECHO_MSG} "japanese/uim-prime"
 	@${ECHO_MSG} "textproc/uim-gnome"
 	@${ECHO_MSG} "textproc/uim-gtk"
 	@${ECHO_MSG} "textproc/uim-m17nlib"
 	@${ECHO_MSG} "textproc/uim-qt"
 	@${ECHO_MSG} ""
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
 
 do-install:
 .if !defined(UIM_SLAVE)
 	cd ${WRKSRC} && ${GMAKE} install-data-am
 .for d in uim scm xim po fep emacs pixmaps
 	cd ${WRKSRC}/${d} && ${GMAKE} install
 .endfor
 	cd ${WRKSRC}/helper && ${GMAKE} install-libexecPROGRAMS
 .endif
 
 .if !defined(UIM_SLAVE) && !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY
 	${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/textproc/uim/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.55
\ No newline at end of property
+1.56
\ No newline at end of property
Index: head/textproc/uim-qt/Makefile
===================================================================
--- head/textproc/uim-qt/Makefile	(revision 168546)
+++ head/textproc/uim-qt/Makefile	(revision 168547)
@@ -1,43 +1,45 @@
 # New ports collection makefile for:   uim-qt
 # Date created:        31 August 2003
 # Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PKGNAMESUFFIX=	-qt
 
 COMMENT=	QT modules of uim input method
 
 LIB_DEPENDS=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 \
 		uim.2:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt
 CONFIGURE_ENV=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include" LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib"
-
+		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+		LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" \
+		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
 UIM_SLAVE=	yes
 
 # This is normally handled by defining USE_QT_VER ...
 
 .if defined(PACKAGE_BUILDING)
 TMPDIR?=	/tmp                
 MAKE_ENV+=	TMPDIR="${TMPDIR}"      
 CONFIGURE_ENV+=	TMPDIR="${TMPDIR}" 
 .endif
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in 
 
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/qt && ${GMAKE} LIBS="-luim -luim-custom")
 
 do-install:
 	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/textproc/uim-qt/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property