Fixed some pkglint warnings.

2 files changed, 13 insertions, 9 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 4be5f158a45..f9ce1041043 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/05/16 13:11:59 gdt Exp $
+# $NetBSD: Makefile,v 1.49 2006/05/21 11:41:59 rillig Exp $
 
 PKGVER=		2.2.3
 DISTNAME=	openMotif-${PKGVER}
@@ -46,8 +46,9 @@ SUBST_CLASSES+=			man_rename
 SUBST_STAGE.man_rename=		pre-configure
 SUBST_MESSAGE.man_rename=	Fixing hardcoded paths.
 SUBST_FILES.man_rename=		doc/man/man3/Makefile.in
-SUBST_SED.man_rename=		-e 's: Core.3: XCore.3:g' \
-	-e 's: Object.3: XObject.3:g' -e 's: Shell.3: XShell.3:g'
+SUBST_SED.man_rename=		-e 's: Core.3: XCore.3:g'
+SUBST_SED.man_rename+=		-e 's: Object.3: XObject.3:g'
+SUBST_SED.man_rename+=		-e 's: Shell.3: XShell.3:g'
 
 
 # 1) Fix the man pages to refer to the correct sections.
@@ -55,6 +56,7 @@ SUBST_SED.man_rename=		-e 's: Core.3: XCore.3:g' \
 #    avoid manpage conflicts with other packages.
 #
 post-patch:
+	set -e; \
 	cd ${WRKSRC}/doc/man;						\
 	for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do		\
 		${SED}	-e "s|user cmd|1|g"				\
@@ -65,13 +67,14 @@ post-patch:
 		${MV} -f $${manpage}.fixed $${manpage};			\
 	done;								\
 	${CP} -f man4/mwmrc.4 man5/mwmrc.5
+	set -e; \
 	cd ${WRKSRC}/doc/man/man3;					\
 	for name in Core Object Shell; do                               \
 		${MV} -f $${name}.3 X$${name}.3;			\
 		files=`${GREP} -l ".fB$${name}.fP(3)" *.3`;		\
 		for manpage in $${files}; do				\
 			${MV} -f $${manpage} $${manpage}.presubst;	\
-			${SED} "s|\(.fB\)$${name}\(.fP(3)\)|\1X$${name}\2|g" \
+			${SED} "s|\\(.fB\\)$${name}\\(.fP(3)\\)|\\1X$${name}\\2|g" \
 				$${manpage}.presubst > $${manpage};	\
 			${RM} -f $${manpage}.presubst;			\
 		done;							\
@@ -79,6 +82,7 @@ post-patch:
 
 # Filter the manpages through tbl.
 post-build:
+	set -e; \
 	cd ${WRKSRC}/doc/man;						\
 	for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do		\
 		${TBL} $${manpage} > $${manpage}.tblized;		\
diff --git a/x11/openmotif/PLIST b/x11/openmotif/PLIST
index 80012378897..d1168b9c8fb 100644
--- a/x11/openmotif/PLIST
+++ b/x11/openmotif/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/12/12 19:55:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/05/21 11:41:59 rillig Exp $
 bin/mwm
 bin/uil
 bin/xmbind
@@ -280,7 +280,6 @@ man/man1/xmbind.1
 man/man3/ApplicationShell.3
 man/man3/Composite.3
 man/man3/Constraint.3
-man/man3/XCore.3
 man/man3/MrmCloseHierarchy.3
 man/man3/MrmFetchBitmapLiteral.3
 man/man3/MrmFetchColorLiteral.3
@@ -296,10 +295,8 @@ man/man3/MrmOpenHierarchyPerDisplay.3
 man/man3/MrmRegisterClass.3
 man/man3/MrmRegisterNames.3
 man/man3/MrmRegisterNamesInHierarchy.3
-man/man3/XObject.3
 man/man3/OverrideShell.3
 man/man3/RectObj.3
-man/man3/XShell.3
 man/man3/TopLevelShell.3
 man/man3/TransientShell.3
 man/man3/Uil.3
@@ -307,6 +304,9 @@ man/man3/UilDumpSymbolTable.3
 man/man3/VendorShell.3
 man/man3/VirtualBindings.3
 man/man3/WMShell.3
+man/man3/XCore.3
+man/man3/XObject.3
+man/man3/XShell.3
 man/man3/XmActivateProtocol.3
 man/man3/XmActivateWMProtocol.3
 man/man3/XmAddProtocolCallback.3
@@ -856,10 +856,10 @@ man/man3/XmVaCreateSimplePulldownMenu.3
 man/man3/XmVaCreateSimpleRadioBox.3
 man/man3/XmWidgetGetBaselines.3
 man/man3/XmWidgetGetDisplayRect.3
-man/man5/mwmrc.5
 man/man5/Traits.5
 man/man5/UIL.5
 man/man5/WML.5
+man/man5/mwmrc.5
 @dirrm include/Mrm
 @dirrm include/X11/bitmaps
 @dirrm include/Xm