25 files changed, 88 insertions, 54 deletions

diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 480332400e6c..b6b58a627596 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -15,10 +15,8 @@ MASTER_SITE_SUBDIR=	libs
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-#ONLY_FOR_ARCHS=	i386 alpha ia64
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-#INSTALLS_SHLIB=	yes
 
 MAN3=		avcall.3 callback.3 trampoline.3 trampoline_r.3 vacall.3
 MANCOMPRESSED=	no
diff --git a/devel/gcvs/pkg-plist b/devel/gcvs/pkg-plist
index f88524dc6866..b8a6336b943f 100644
--- a/devel/gcvs/pkg-plist
+++ b/devel/gcvs/pkg-plist
@@ -3,6 +3,8 @@ bin/cvsbug
 bin/cvstree
 bin/gcvs
 bin/rcs2log
+@unexec install-info --delete %D/info/cvs.info %D/info/dir
+@unexec install-info --delete %D/info/cvsclient.info %D/info/dir
 info/cvs.info
 info/cvs.info-1
 info/cvs.info-2
@@ -17,6 +19,8 @@ info/cvsclient.info
 info/cvsclient.info-1
 info/cvsclient.info-2
 info/cvsclient.info-3
+@exec install-info %D/info/cvs.info %D/info/dir
+@exec install-info %D/info/cvsclient.info %D/info/dir
 lib/cvs/contrib/README
 lib/cvs/contrib/clmerge
 lib/cvs/contrib/cln_hist
diff --git a/devel/m6811-gcc/pkg-plist b/devel/m6811-gcc/pkg-plist
index 01b43a531a93..b4efca01ae6f 100644
--- a/devel/m6811-gcc/pkg-plist
+++ b/devel/m6811-gcc/pkg-plist
@@ -73,7 +73,7 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/f77.info %D/info/dir
+@exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/m6811-elf/%%GCC_VER%%/include/assert.h
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index 3535355f5dbd..472d92faecb0 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
 		${MASTER_SITES_DLZ:S/$/:dlz/}
+MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 PKGNAMESUFFIX=	-dlz
 DISTFILES=	bind-${ISCVERSION}.tar.gz \
 	   	DLZ-${DLZVERSION}${EXTRACT_SUFX}:dlz
@@ -19,7 +20,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 POSTGRESQL_PORT?=	databases/postgresql7
 MASTER_SITES_DLZ=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 
 ISCVERSION=	9.2.1
 DLZVERSION=	0.3.0
@@ -42,23 +42,23 @@ NO_DESCRIBE=yes
 .if defined(WITH_POSTGRESQL_DRIVER)
 .if !defined(WITHOUT_POSTGRESQL_DRIVER)
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-CONFIGURE_ARGS+= --with-dlz-postgres
+CONFIGURE_ARGS+=	--with-dlz-postgres
 .endif
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+= --with-dlz-mysql
+CONFIGURE_ARGS+=	--with-dlz-mysql
 .endif
 
 .if defined(WITH_FILESYSTEM_DRIVER)
 .if !defined(WITHOUT_FILESYSTEM_DRIVER)
-CONFIGURE_ARGS+= --with-dlz-filesystem
+CONFIGURE_ARGS+=	--with-dlz-filesystem
 .endif
 .endif
 
 .if defined(WITH_STUB_DRIVER)
-CONFIGURE_ARGS+= --with-dlz-stub
+CONFIGURE_ARGS+=	--with-dlz-stub
 .endif
 
 WRKSRC=		${WRKDIR}/bind-${ISCVERSION}
@@ -177,7 +177,7 @@ post-clean:
 .if defined(WITH_OPENSSL)
 .if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/security/openssl/Makefile.ssl"
-CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 .endif
 
diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 28c71faf507f..5e2f28dfddd5 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.dinoex.org/pub/unix-connect/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=     dinoex@freebsd.org
+MAINTAINER=	dinoex@freebsd.org
 
 BUILD_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
 
@@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--with-spooldir=/var/spool/uconnect
 CONFIGURE_ARGS+=--with-mail=sendmail
 CONFIGURE_ARGS+=--with-news=cnews
 CONFIGURE_ARGS+=--enable-testing
-CFLAGS+=-g
-CFLAGS:= ${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
+CFLAGS+=	-g
+CFLAGS:=	${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/german/unix-connect/pkg-descr b/german/unix-connect/pkg-descr
index 37a8228ae306..b74e1bc19b0f 100644
--- a/german/unix-connect/pkg-descr
+++ b/german/unix-connect/pkg-descr
@@ -19,3 +19,4 @@ vermieden werden koennen.
 FTP: ftp://unix-connect.sf.net/pub/unix-connect/
 FTP: ftp://ftp.dinoex.org/pub/unix-connect/
 WWW: http://www.dinoex.de/unix-connect.html
+WWW: http://sourceforge.net/projects/unix-connect/
diff --git a/german/webalizer2/Makefile b/german/webalizer2/Makefile
index 580dc90aa698..ca8f551e29a6 100644
--- a/german/webalizer2/Makefile
+++ b/german/webalizer2/Makefile
@@ -4,9 +4,12 @@
 #
 # $FreeBSD$
 
+CATEGORIES=	german
 PKGNAMEPREFIX?=	de-
+
+MAINTAINER=	dinoex@FreeBSD.org
+
 MASTERDIR?=	${.CURDIR}/../../www/webalizer
-CATEGORIES=	german
 WEBALIZER_LANG=	german
 
 .if exists(${.CURDIR}/Makefile.local)
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index e2f88efef4ac..977be873cd86 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -21,8 +21,8 @@ CTARGETS+=	rays-filter
 CFLAGS+=	-Wall ${PTHREAD_CFLAGS:S=""==}
 LIBS+=		${PTHREAD_LIBS}
 .if !defined(SENDMAIL_MILTER_IN_BASE)
-CFLAGS+=	-I$(LOCALBASE)/include
-LDFLAGS+=	-L$(LOCALBASE)/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 ETCFILES=	header-list.conf mail-filter.conf string-list.conf
 BINFILES=	mf-reset mf-start mf-stop mf-archive mf-analyze mf-memory
@@ -53,7 +53,7 @@ pre-fetch:
 .for i in ${CTARGETS}
 ${i}:
 	cd ${WRKSRC} && \
-	$(CC) $(CFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${i} ${i}.c ${LIBS} ${FLAGS}
 
 .endfor
 
diff --git a/mail/sendmail-ldap/Makefile b/mail/sendmail-ldap/Makefile
index 5f56853e2602..4116a55a4844 100644
--- a/mail/sendmail-ldap/Makefile
+++ b/mail/sendmail-ldap/Makefile
@@ -4,6 +4,10 @@
 #
 # $FreeBSD$
 
+PKGNAMESUFFIX?=	-ldap
+
+MAINTAINER=	dinoex@FreeBSD.org
+
 SENDMAIL_WITH_LDAP=	yes
 SENDMAIL_WITH_TLS=	yes
 .if defined(SENDMAIL_WITH_SUID)
@@ -16,7 +20,6 @@ MASTERDIR?=	${.CURDIR}/../sendmail-old
 SENDMAIL_WITH_SASL2=	yes
 MASTERDIR?=	${.CURDIR}/../sendmail
 .endif
-PKGNAMESUFFIX?=	-ldap
 
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
diff --git a/mail/sendmail-sasl/Makefile b/mail/sendmail-sasl/Makefile
index a7b8972758b0..4f73601d5035 100644
--- a/mail/sendmail-sasl/Makefile
+++ b/mail/sendmail-sasl/Makefile
@@ -4,6 +4,10 @@
 #
 # $FreeBSD$
 
+PKGNAMESUFFIX?=	-sasl
+
+MAINTAINER=	dinoex@FreeBSD.org
+
 SENDMAIL_WITH_TLS=	yes
 .if defined(SENDMAIL_WITH_SUID)
 # only for compatibility with sendmail 8.11.x
@@ -15,7 +19,6 @@ MASTERDIR?=	${.CURDIR}/../sendmail-old
 SENDMAIL_WITH_SASL2=	yes
 MASTERDIR?=	${.CURDIR}/../sendmail
 .endif
-PKGNAMESUFFIX?=	-sasl
 
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 2369313237cb..98bf5181aef0 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -232,8 +232,8 @@ install-sasldb:
 # create certificates for TLS/SSL
 #
 tls-install:
-	env DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
-		sh ${FILESDIR}/tls-install.sh
+	${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
+		${SH} ${FILESDIR}/tls-install.sh
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 2369313237cb..98bf5181aef0 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -232,8 +232,8 @@ install-sasldb:
 # create certificates for TLS/SSL
 #
 tls-install:
-	env DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
-		sh ${FILESDIR}/tls-install.sh
+	${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
+		${SH} ${FILESDIR}/tls-install.sh
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/sma/pkg-plist b/mail/sma/pkg-plist
index 1496bd5b559e..30aefe599f4a 100644
--- a/mail/sma/pkg-plist
+++ b/mail/sma/pkg-plist
@@ -7,4 +7,3 @@ bin/sma
 %%PORTDOCS%%@dirrm share/doc/sma
 %%PORTDOCS%%share/examples/sma/sma.conf
 %%PORTDOCS%%@dirrm share/examples/sma
-
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index 6f4bc6fa73fc..5312892f2ad1 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -23,8 +23,8 @@ CTARGETS+=	vbsfilter-${PORTVERSION}
 LIBS+=		${PTHREAD_LIBS}
 CFLAGS+=	-Wall ${PTHREAD_CFLAGS:S=""==}
 .if !defined(SENDMAIL_MILTER_IN_BASE)
-CFLAGS+=	-I$(LOCALBASE)/include
-LDFLAGS+=	-L$(LOCALBASE)/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .include <bsd.port.pre.mk>
@@ -57,7 +57,7 @@ do-extract:
 .for i in ${CTARGETS}
 ${i}:
 	cd ${WRKSRC} && \
-	$(CC) $(CFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${i} ${i}.c ${LIBS} ${FLAGS}
 
 .endfor
 
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index a9b6484216ae..fd2bfb3986b7 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -21,7 +21,7 @@ INCDIR=		${PORTSDIR}/net
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=3
 CONFIGURE_ARGS+=--with-kde
-CONFIGURE_ENV+= KDEDIR="${LOCALBASE}"
+CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 PLIST_SUB+=	GUI_NAME=kde
 .else
 USE_QT_VER=	3
diff --git a/net/bind9-dlz/Makefile b/net/bind9-dlz/Makefile
index 3535355f5dbd..472d92faecb0 100644
--- a/net/bind9-dlz/Makefile
+++ b/net/bind9-dlz/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
 		${MASTER_SITES_DLZ:S/$/:dlz/}
+MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 PKGNAMESUFFIX=	-dlz
 DISTFILES=	bind-${ISCVERSION}.tar.gz \
 	   	DLZ-${DLZVERSION}${EXTRACT_SUFX}:dlz
@@ -19,7 +20,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 POSTGRESQL_PORT?=	databases/postgresql7
 MASTER_SITES_DLZ=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 
 ISCVERSION=	9.2.1
 DLZVERSION=	0.3.0
@@ -42,23 +42,23 @@ NO_DESCRIBE=yes
 .if defined(WITH_POSTGRESQL_DRIVER)
 .if !defined(WITHOUT_POSTGRESQL_DRIVER)
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-CONFIGURE_ARGS+= --with-dlz-postgres
+CONFIGURE_ARGS+=	--with-dlz-postgres
 .endif
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+= --with-dlz-mysql
+CONFIGURE_ARGS+=	--with-dlz-mysql
 .endif
 
 .if defined(WITH_FILESYSTEM_DRIVER)
 .if !defined(WITHOUT_FILESYSTEM_DRIVER)
-CONFIGURE_ARGS+= --with-dlz-filesystem
+CONFIGURE_ARGS+=	--with-dlz-filesystem
 .endif
 .endif
 
 .if defined(WITH_STUB_DRIVER)
-CONFIGURE_ARGS+= --with-dlz-stub
+CONFIGURE_ARGS+=	--with-dlz-stub
 .endif
 
 WRKSRC=		${WRKDIR}/bind-${ISCVERSION}
@@ -177,7 +177,7 @@ post-clean:
 .if defined(WITH_OPENSSL)
 .if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/security/openssl/Makefile.ssl"
-CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 .endif
 
diff --git a/net/licq-jons-gtk-gui/pkg-comment b/net/licq-jons-gtk-gui/pkg-comment
index e70c7ca69e91..9089d4f2a15a 100644
--- a/net/licq-jons-gtk-gui/pkg-comment
+++ b/net/licq-jons-gtk-gui/pkg-comment
@@ -1 +1 @@
-jons GTK plugin for licq
+Jons GTK plugin for licq
diff --git a/net/licq-qt-gui/Makefile b/net/licq-qt-gui/Makefile
index a9b6484216ae..fd2bfb3986b7 100644
--- a/net/licq-qt-gui/Makefile
+++ b/net/licq-qt-gui/Makefile
@@ -21,7 +21,7 @@ INCDIR=		${PORTSDIR}/net
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=3
 CONFIGURE_ARGS+=--with-kde
-CONFIGURE_ENV+= KDEDIR="${LOCALBASE}"
+CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 PLIST_SUB+=	GUI_NAME=kde
 .else
 USE_QT_VER=	3
diff --git a/security/gnupg-idea/pkg-message b/security/gnupg-idea/pkg-message
index 87c149392dba..726a17637bce 100644
--- a/security/gnupg-idea/pkg-message
+++ b/security/gnupg-idea/pkg-message
@@ -1,4 +1,3 @@
-
 ---------------------------------------------------
 
 IDEA:
@@ -15,4 +14,3 @@ RSA:	rsa is now included in gnupg >= 1.0.3
 	still included for demonstration.
 
 ---------------------------------------------------
-
diff --git a/security/lsh/pkg-plist b/security/lsh/pkg-plist
index 228478e14681..8f51c4171d87 100644
--- a/security/lsh/pkg-plist
+++ b/security/lsh/pkg-plist
@@ -35,8 +35,8 @@ info/lsh.info
 info/nettle.info
 info/nettle.info-1
 info/nettle.info-2
-@exec install-info --section="Miscellaneous" --entry="* LSH: (lsh).			lsh secure remote shell documentation." %D/info/lsh.info %D/info/dir
-@exec install-info --section="GNU Libraries" --entry="* Nettle: (nettle).		A low-level cryptographics library." %D/info/nettle.info %D/info/dir
+@exec install-info %D/info/lsh.info %D/info/dir
+@exec install-info %D/info/nettle.info %D/info/dir
 lib/libnettle.a
 sbin/lsh-execuv
 %%KRB%%sbin/lsh-krb-checkpw
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index f852c5e76c3f..e15c2df6a90c 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openssl
-PKGNAMESUFFIX=	-beta
 PORTVERSION=	0.9.7
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
 		ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
+PKGNAMESUFFIX=	-beta
 
 MAINTAINER=	dinoex@FreeBSD.org
 
diff --git a/www/twig/Makefile b/www/twig/Makefile
index 00058c17e368..58b1d796910f 100644
--- a/www/twig/Makefile
+++ b/www/twig/Makefile
@@ -45,7 +45,7 @@ do-install:
 	@${CP} ${WRKSRC}/config/${i} ${PREFIX}/${TWIG}/config/${i}-dist
 	@if test ! -f ${PREFIX}/${TWIG}/config/${i} ; then \
 		${CP} ${WRKSRC}/config/${i} ${PREFIX}/${TWIG}/config/${i}; \
-        fi
+	fi
 .endfor
-	
+
 .include <bsd.port.mk>
diff --git a/www/twig/pkg-plist b/www/twig/pkg-plist
index 724d1325d717..4744f96baf09 100644
--- a/www/twig/pkg-plist
+++ b/www/twig/pkg-plist
@@ -1533,6 +1533,7 @@
 @dirrm %%TWIG%%/config
 @dirrm %%TWIG%%/features/admin/help/english
 @dirrm %%TWIG%%/features/admin/help/french
+@dirrm %%TWIG%%/features/admin/help/german
 @dirrm %%TWIG%%/features/admin/help/spanish
 @dirrm %%TWIG%%/features/admin/help
 @dirrm %%TWIG%%/features/admin/modules
@@ -1540,10 +1541,13 @@
 @dirrm %%TWIG%%/features/admin
 @dirrm %%TWIG%%/features/main/help/english
 @dirrm %%TWIG%%/features/main/help/french
+@dirrm %%TWIG%%/features/bookmarks/help/german
+@dirrm %%TWIG%%/features/bookmarks/help
 @dirrm %%TWIG%%/features/bookmarks/strings
 @dirrm %%TWIG%%/features/bookmarks
 @dirrm %%TWIG%%/features/contacts/help/english
 @dirrm %%TWIG%%/features/contacts/help/french
+@dirrm %%TWIG%%/features/contacts/help/german
 @dirrm %%TWIG%%/features/contacts/help/spanish
 @dirrm %%TWIG%%/features/contacts/help
 @dirrm %%TWIG%%/features/contacts/import.defs
@@ -1552,43 +1556,55 @@
 @dirrm %%TWIG%%/features/groups/strings
 @dirrm %%TWIG%%/features/groups
 @dirrm %%TWIG%%/features/help/help/english
+@dirrm %%TWIG%%/features/help/help/german
 @dirrm %%TWIG%%/features/help/help/portuguese
 @dirrm %%TWIG%%/features/help/help/spanish
 @dirrm %%TWIG%%/features/help/help
 @dirrm %%TWIG%%/features/help/strings
 @dirrm %%TWIG%%/features/help
 @dirrm %%TWIG%%/features/logout/help/english
+@dirrm %%TWIG%%/features/logout/help/german
 @dirrm %%TWIG%%/features/logout/help/spanish
 @dirrm %%TWIG%%/features/logout/help
 @dirrm %%TWIG%%/features/logout/strings
 @dirrm %%TWIG%%/features/logout
 @dirrm %%TWIG%%/features/mail/help/english
 @dirrm %%TWIG%%/features/mail/help/french
+@dirrm %%TWIG%%/features/mail/help/german
 @dirrm %%TWIG%%/features/mail/help/portuguese
 @dirrm %%TWIG%%/features/mail/help/spanish
 @dirrm %%TWIG%%/features/mail/help
 @dirrm %%TWIG%%/features/mail/strings
 @dirrm %%TWIG%%/features/mail
+@dirrm %%TWIG%%/features/main/help/german
 @dirrm %%TWIG%%/features/main/help/spanish
 @dirrm %%TWIG%%/features/main/help
 @dirrm %%TWIG%%/features/main/modules
 @dirrm %%TWIG%%/features/main/strings
 @dirrm %%TWIG%%/features/main
 @dirrm %%TWIG%%/features/meetings/help/english
+@dirrm %%TWIG%%/features/meetings/help/german
 @dirrm %%TWIG%%/features/meetings/help/spanish
 @dirrm %%TWIG%%/features/meetings/help
 @dirrm %%TWIG%%/features/meetings/strings
 @dirrm %%TWIG%%/features/meetings
 @dirrm %%TWIG%%/features/news/help/english
+@dirrm %%TWIG%%/features/news/help/german
 @dirrm %%TWIG%%/features/news/help/spanish
 @dirrm %%TWIG%%/features/news/help
 @dirrm %%TWIG%%/features/news/strings
 @dirrm %%TWIG%%/features/news
+@dirrm %%TWIG%%/features/notes/help/german
+@dirrm %%TWIG%%/features/notes/help
 @dirrm %%TWIG%%/features/notes/strings
 @dirrm %%TWIG%%/features/notes
+@dirrm %%TWIG%%/features/prefs/help/german
+@dirrm %%TWIG%%/features/prefs/help
 @dirrm %%TWIG%%/features/prefs/modules
 @dirrm %%TWIG%%/features/prefs/strings
 @dirrm %%TWIG%%/features/prefs
+@dirrm %%TWIG%%/features/schedule/help/german
+@dirrm %%TWIG%%/features/schedule/help
 @dirrm %%TWIG%%/features/schedule/strings
 @dirrm %%TWIG%%/features/schedule
 @dirrm %%TWIG%%/features/search/help/english
@@ -1598,36 +1614,44 @@
 @dirrm %%TWIG%%/features/search
 @dirrm %%TWIG%%/features/shared
 @dirrm %%TWIG%%/features/todo/help/english
+@dirrm %%TWIG%%/features/todo/help/german
 @dirrm %%TWIG%%/features/todo/help/spanish
 @dirrm %%TWIG%%/features/todo/help
 @dirrm %%TWIG%%/features/todo/strings
 @dirrm %%TWIG%%/features/todo
 @dirrm %%TWIG%%/features
-@dirrm %%TWIG%%/images/menus/news/english
-@dirrm %%TWIG%%/images/menus/news/german
-@dirrm %%TWIG%%/images/menus/news/italian
-@dirrm %%TWIG%%/images/menus/news
+@dirrm %%TWIG%%/images/menus/bookmarks/english
+@dirrm %%TWIG%%/images/menus/bookmarks/french
+@dirrm %%TWIG%%/images/menus/bookmarks/german
+@dirrm %%TWIG%%/images/menus/bookmarks/italian
+@dirrm %%TWIG%%/images/menus/bookmarks
 @dirrm %%TWIG%%/images/menus/contacts/english
+@dirrm %%TWIG%%/images/menus/contacts/french
 @dirrm %%TWIG%%/images/menus/contacts/german
 @dirrm %%TWIG%%/images/menus/contacts/italian
 @dirrm %%TWIG%%/images/menus/contacts
 @dirrm %%TWIG%%/images/menus/groups/english
+@dirrm %%TWIG%%/images/menus/groups/french
 @dirrm %%TWIG%%/images/menus/groups/german
 @dirrm %%TWIG%%/images/menus/groups/italian
 @dirrm %%TWIG%%/images/menus/groups
 @dirrm %%TWIG%%/images/menus/mail/english
+@dirrm %%TWIG%%/images/menus/mail/french
 @dirrm %%TWIG%%/images/menus/mail/german
 @dirrm %%TWIG%%/images/menus/mail/italian
 @dirrm %%TWIG%%/images/menus/mail
 @dirrm %%TWIG%%/images/menus/meetings/english
+@dirrm %%TWIG%%/images/menus/meetings/french
 @dirrm %%TWIG%%/images/menus/meetings/german
 @dirrm %%TWIG%%/images/menus/meetings/italian
 @dirrm %%TWIG%%/images/menus/meetings
-@dirrm %%TWIG%%/images/menus/bookmarks/english
-@dirrm %%TWIG%%/images/menus/bookmarks/german
-@dirrm %%TWIG%%/images/menus/bookmarks/italian
-@dirrm %%TWIG%%/images/menus/bookmarks
+@dirrm %%TWIG%%/images/menus/news/english
+@dirrm %%TWIG%%/images/menus/news/french
+@dirrm %%TWIG%%/images/menus/news/german
+@dirrm %%TWIG%%/images/menus/news/italian
+@dirrm %%TWIG%%/images/menus/news
 @dirrm %%TWIG%%/images/menus/notes/english
+@dirrm %%TWIG%%/images/menus/notes/french
 @dirrm %%TWIG%%/images/menus/notes/german
 @dirrm %%TWIG%%/images/menus/notes/italian
 @dirrm %%TWIG%%/images/menus/notes
@@ -1648,10 +1672,12 @@
 @dirrm %%TWIG%%/images/menus/primary/test
 @dirrm %%TWIG%%/images/menus/primary
 @dirrm %%TWIG%%/images/menus/schedule/english
+@dirrm %%TWIG%%/images/menus/schedule/french
 @dirrm %%TWIG%%/images/menus/schedule/german
 @dirrm %%TWIG%%/images/menus/schedule/italian
 @dirrm %%TWIG%%/images/menus/schedule
 @dirrm %%TWIG%%/images/menus/todo/english
+@dirrm %%TWIG%%/images/menus/todo/french
 @dirrm %%TWIG%%/images/menus/todo/german
 @dirrm %%TWIG%%/images/menus/todo/italian
 @dirrm %%TWIG%%/images/menus/todo
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index d373cfb524ef..984abd6c7925 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -25,7 +25,6 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	aclocal.m4 test/aclocal.m4
-PLIST_SUB+=	PREFIX=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-static --enable-shared --enable-production
 CONFIGURE_ARGS+=	--disable-build-Xlt --disable-build-Xbae
 CONFIGURE_ARGS+=	--enable-build-12 --disable-build-20
@@ -52,10 +51,10 @@ MAN3 =	ApplicationShell.3 Composite.3 Constraint.3 Core.3 \
 	XmTextField.3 XmToggleButton.3 XmToggleButtonGadget.3 XmVendorShell.3 \
 	XmWorld.3
 
-MAN5 = VirtualBindings.5 mwmrc.5
+MAN5 =	VirtualBindings.5 mwmrc.5
 
 .if defined(HAVE_MOTIF) && !defined(PARALLEL_PACKAGE_BUILD)
-IS_INTERACTIVE= yes
+IS_INTERACTIVE=	yes
 pre-extract:
 	@${ECHO} "***********************************************************"
 	@${ECHO} "*                      W a r n i n g                      *"
diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist
index 78b8c040d439..74bad48f9b45 100644
--- a/x11-toolkits/lesstif/pkg-plist
+++ b/x11-toolkits/lesstif/pkg-plist
@@ -354,5 +354,5 @@ lib/libXm.so.2
 @dirrm include/Xm
 @dirrm include/uil
 @dirrm lib/X11/mwm
-@cwd %%PREFIX%%
+@cwd %%LOCALBASE%%
 share/aclocal/ac_find_motif.m4