2 files changed, 79 insertions, 48 deletions

diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index c706e9887843..5bc90179a0dd 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2
 
 CONFLICTS?=	open-motif-*
-NO_STAGE=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	automake:env autoconf libtool
@@ -26,50 +25,6 @@ CONFIGURE_ARGS+=	--enable-static --enable-shared --enable-production
 CONFIGURE_ARGS+=	--disable-maintainer-mode
 CFLAGS+=	-I${LOCALBASE}/include
 
-MAN1 =	lesstif.1 ltversion.1 mwm.1 uil.1 xmbind.1
-
-MAN3 =	ApplicationShell.3 Composite.3 Constraint.3 Core.3 \
-	LessTifInternals.3 Object.3 OverrideShell.3 Rect.3 Shell.3 \
-	TopLevelShell.3 TransientShell.3 UnNamedObj.3 VendorShell.3 \
-	WmShell.3 XmArrowButton.3 XmArrowButtonGadget.3 XmBulletinBoard.3 \
-	XmCascadeButton.3 XmCascadeButtonGadget.3 XmClipboard.3 \
-	XmComboBox.3 XmCommand.3 XmDesktop.3 XmDialogShell.3 \
-	XmDialogShellExt.3 XmDisplay.3 XmDragContext.3 XmDragIcon.3 \
-	XmDragOverShell.3 XmDrawingArea.3 XmDrawnButton.3 XmDropSiteManager.3 \
-	XmDropTransfer.3 XmFileSelectionBox.3 XmForm.3 XmFrame.3 XmGadget.3 \
-	XmGrabShell.3 XmIconGadget.3 XmLabel.3 XmLabelGadget.3 XmList.3 \
-	XmMainWindow.3 XmManager.3 XmMenuShell.3 XmMessageBox.3 XmNotebook.3 \
-	XmPanedWindow.3 XmPrimitive.3 XmProtocol.3 XmPushButton.3 \
-	XmPushButtonGadget.3 XmRowColumn.3 XmSash.3 XmScale.3 XmScreen.3 \
-	XmScrollBar.3 XmScrolledWindow.3 XmSelectionBox.3 XmSeparator.3 \
-	XmSeparatorGadget.3 XmSpinBox.3 XmString.3 XmTearOffButton.3 XmText.3 \
-	XmTextField.3 XmToggleButton.3 XmToggleButtonGadget.3 XmVendorShell.3 \
-	XmWorld.3
-
-MAN5 =	VirtualBindings.5 mwmrc.5
-
-.if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING) && !defined(BATCH) && !defined(WANT_LESSTIF)
-MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
-IS_INTERACTIVE=	yes
-pre-extract:
-	@${ECHO_CMD} "***********************************************************"
-	@${ECHO_CMD} "*                      W a r n i n g                      *"
-	@${ECHO_CMD} "*    This port will overwrite your Motif installation.    *"
-	@${ECHO_CMD} "***********************************************************"
-	@${ECHO_CMD} -n "Is this ok? (y/n) ==> "
-	@(read ans; \
-	  case x"$$ans" in \
-	    xy*|xY*) \
-		return 0; \
-		;; \
-	    *) \
-		${ECHO_CMD} "Okay, I won't install it then...."; \
-		${ECHO_CMD} "(Don't worry about the following \"*** Error code 1's)"; \
-		return 1; \
-		;; \
-	esac)
-.endif
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|LT_HAVE_FREETYPE|FINDXFT_HAVE_FREETYPE|g' \
@@ -77,8 +32,7 @@ post-patch:
 		${WRKSRC}/acinclude.m4
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \
-		${PREFIX}/share/aclocal
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \
+		${STAGEDIR}${PREFIX}/share/aclocal
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist
index 3f49d7c75527..d3d1ea8db9dd 100644
--- a/x11-toolkits/lesstif/pkg-plist
+++ b/x11-toolkits/lesstif/pkg-plist
@@ -346,6 +346,83 @@ lib/libXm.a
 lib/libXm.la
 lib/libXm.so
 lib/libXm.so.2
+man/man1/lesstif.1.gz
+man/man1/ltversion.1.gz
+man/man1/mwm.1.gz
+man/man1/uil.1.gz
+man/man1/xmbind.1.gz
+man/man3/ApplicationShell.3.gz
+man/man3/Composite.3.gz
+man/man3/Constraint.3.gz
+man/man3/Core.3.gz
+man/man3/LessTifInternals.3.gz
+man/man3/Object.3.gz
+man/man3/OverrideShell.3.gz
+man/man3/Rect.3.gz
+man/man3/Shell.3.gz
+man/man3/TopLevelShell.3.gz
+man/man3/TransientShell.3.gz
+man/man3/UnNamedObj.3.gz
+man/man3/VendorShell.3.gz
+man/man3/WmShell.3.gz
+man/man3/XmArrowButton.3.gz
+man/man3/XmArrowButtonGadget.3.gz
+man/man3/XmBulletinBoard.3.gz
+man/man3/XmCascadeButton.3.gz
+man/man3/XmCascadeButtonGadget.3.gz
+man/man3/XmClipboard.3.gz
+man/man3/XmComboBox.3.gz
+man/man3/XmCommand.3.gz
+man/man3/XmDesktop.3.gz
+man/man3/XmDialogShell.3.gz
+man/man3/XmDialogShellExt.3.gz
+man/man3/XmDisplay.3.gz
+man/man3/XmDragContext.3.gz
+man/man3/XmDragIcon.3.gz
+man/man3/XmDragOverShell.3.gz
+man/man3/XmDrawingArea.3.gz
+man/man3/XmDrawnButton.3.gz
+man/man3/XmDropSiteManager.3.gz
+man/man3/XmDropTransfer.3.gz
+man/man3/XmFileSelectionBox.3.gz
+man/man3/XmForm.3.gz
+man/man3/XmFrame.3.gz
+man/man3/XmGadget.3.gz
+man/man3/XmGrabShell.3.gz
+man/man3/XmIconGadget.3.gz
+man/man3/XmLabel.3.gz
+man/man3/XmLabelGadget.3.gz
+man/man3/XmList.3.gz
+man/man3/XmMainWindow.3.gz
+man/man3/XmManager.3.gz
+man/man3/XmMenuShell.3.gz
+man/man3/XmMessageBox.3.gz
+man/man3/XmNotebook.3.gz
+man/man3/XmPanedWindow.3.gz
+man/man3/XmPrimitive.3.gz
+man/man3/XmProtocol.3.gz
+man/man3/XmPushButton.3.gz
+man/man3/XmPushButtonGadget.3.gz
+man/man3/XmRowColumn.3.gz
+man/man3/XmSash.3.gz
+man/man3/XmScale.3.gz
+man/man3/XmScreen.3.gz
+man/man3/XmScrollBar.3.gz
+man/man3/XmScrolledWindow.3.gz
+man/man3/XmSelectionBox.3.gz
+man/man3/XmSeparator.3.gz
+man/man3/XmSeparatorGadget.3.gz
+man/man3/XmSpinBox.3.gz
+man/man3/XmString.3.gz
+man/man3/XmTearOffButton.3.gz
+man/man3/XmText.3.gz
+man/man3/XmTextField.3.gz
+man/man3/XmToggleButton.3.gz
+man/man3/XmToggleButtonGadget.3.gz
+man/man3/XmVendorShell.3.gz
+man/man3/XmWorld.3.gz
+man/man5/VirtualBindings.5.gz
+man/man5/mwmrc.5.gz
 share/aclocal/ac_find_motif.m4
 @unexec rm -f %D/LessTif/doc/Lessdox
 @dirrm LessTif/doc/images