OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/mgdiff/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 19 Oct 2010 07:54:22 -0000 1.24
+++ Makefile 23 Oct 2010 16:49:16 -0000
@@ -18,7 +18,6 @@ WANTLIB= ICE SM X11 Xau Xdmcp Xext Xmu X
USE_X11= Yes
USE_MOTIF= any
-USE_GROFF = Yes
CONFIGURE_STYLE=imake
NO_REGRESS= Yes
@@ -26,6 +25,6 @@ NO_REGRESS= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/mgdiff
${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${PREFIX}/lib/X11/mgdiff
- ${INSTALL_MAN} ${WRKSRC}/mgdiff.man ${PREFIX}/man/man1/mgdiff.1
+ mandoc ${WRKSRC}/mgdiff.man > ${PREFIX}/man/cat1/mgdiff.0
.include <bsd.port.mk>
Index: patches/patch-mgdiff_man
===================================================================
RCS file: patches/patch-mgdiff_man
diff -N patches/patch-mgdiff_man
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mgdiff_man 23 Oct 2010 16:49:16 -0000
@@ -0,0 +1,262 @@
+$OpenBSD$
+--- mgdiff.man.orig Sat Oct 23 12:29:36 2010
++++ mgdiff.man Sat Oct 23 12:29:58 2010
+@@ -144,25 +144,25 @@ and accelerator, if any.
+ .IP "\fBFile\fP"
+ .LP
+ This pulldown menu controls file access:
+-.RS \n(XXP
+-.IP "\fBOpen...\fP" \n(XYP
++.RS
++.IP "\fBOpen...\fP"
+ .B Ctrl+O
+ .LP
+ Brings up the "Open Files" FileSelectionDialog to allow the user to
+ open two files for comparison.
+-.IP "\fBOpen Left...\fP" \n(XYP
++.IP "\fBOpen Left...\fP"
+ .B Ctrl+L
+ .LP
+ Brings up the "Open File" FileSelectionDialog to allow the user to
+ specify a file to open and compare with the already opened right\-hand
+ file.
+-.IP "\fBOpen Right...\fP" \n(XYP
++.IP "\fBOpen Right...\fP"
+ .B Ctrl+R
+ .LP
+ Brings up the "Open File" FileSelectionDialog to allow the user to
+ specify a file to open and compare with the already opened left\-hand
+ file.
+-.IP "\fBSave As...\fP" \n(XYP
++.IP "\fBSave As...\fP"
+ .B Ctrl+S
+ .LP
+ Brings up the "Save File" FileSelectionDialog to allow the user to
+@@ -172,7 +172,7 @@ overwrite an existing file but pops up a QuestionDialo
+ user to cancel the operation if desired. If there are any unselected
+ areas of difference between the two files the user is notified via an
+ ErrorDialog and the save operation is canceled.
+-.IP "\fBExit\fP" \n(XYP
++.IP "\fBExit\fP"
+ .B Ctrl+C
+ .LP
+ Exits the program immediately.
+@@ -181,20 +181,20 @@ Exits the program immediately.
+ .IP "\fBView\fP"
+ .LP
+ This pulldown menu contains commands for moving through the files.
+-.RS \n(XXP
+-.IP "\fBPrevious\fP" \n(XYP
++.RS
++.IP "\fBPrevious\fP"
+ .B Ctrl+P
+ .LP
+ Scrolls both file views so that the previous area of difference is
+ .I Mgdiff.linesOfContext
+ lines from the top of the application window.
+-.IP "\fBNext\fP" \n(XYP
++.IP "\fBNext\fP"
+ .B Ctrl+N
+ .LP
+ Scrolls both file views so that the next area of difference is
+ .I Mgdiff.linesOfContext
+ lines from the top of the application window.
+-.IP "\fBNext Unselected\fP" \n(XYP
++.IP "\fBNext Unselected\fP"
+ .B Ctrl+U
+ .LP
+ Scrolls both file views so that the next unselected area of difference is
+@@ -209,14 +209,14 @@ To do this, the user must select for each area of diff
+ the two files which version should be written to the merged file. The
+ menu entries in this pulldown menu allow the user to select or
+ unselect differences in groups rather than individually.
+-.RS \n(XXP
+-.IP "\fBLeft All\fP" \n(XYP
++.RS
++.IP "\fBLeft All\fP"
+ .LP
+ For all areas of difference between the two files select the left\-hand file
version.
+-.IP "\fBRight All\fP" \n(XYP
++.IP "\fBRight All\fP"
+ .LP
+ For all areas of difference between the two files select the right\-hand file
version.
+-.IP "\fBUnselect All\fP" \n(XYP
++.IP "\fBUnselect All\fP"
+ .LP
+ Unselects all areas of difference in both files.
+ .RE
+@@ -225,8 +225,8 @@ Unselects all areas of difference in both files.
+ .LP
+ This pulldown menu controls miscellaneous appearance and/or behavior
+ options.
+-.RS \n(XXP
+-.IP "\fBOverview\fP" \n(XYP
++.RS
++.IP "\fBOverview\fP"
+ .B Ctrl+W
+ .LP
+ This menu entry toggles the presence of the overview area on the
+@@ -234,7 +234,7 @@ right\-hand side of the application window. The defau
+ this toggle is controlled by a resource,
+ .IR Mgdiff.overview ,
+ which is described in the RESOURCES section.
+-.IP "\fBHorizontal Scrollbar\fP" \n(XYP
++.IP "\fBHorizontal Scrollbar\fP"
+ .B Ctrl+H
+ .LP
+ This menu entry toggles the presence of the horizontal scrollbar at
+@@ -242,7 +242,7 @@ the bottom of the application window. The default val
+ toggle is controlled by a resource,
+ .IR Mgdiff.horzScrollbar ,
+ which is described in the RESOURCES section.
+-.IP "\fBDrag Scroll\fP" \n(XYP
++.IP "\fBDrag Scroll\fP"
+ .B Ctrl+D
+ .LP
+ This menu entry toggles the behaviour of the scrollbars in the
+@@ -261,12 +261,12 @@ which is described in the RESOURCES section.
+ This pulldown menu displays commands for obtaining help on or
+ information about
+ .IR mgdiff .
+-.RS \n(XXP
+-.IP "\fBVersion...\fP" \n(XYP
++.RS
++.IP "\fBVersion...\fP"
+ .B Ctrl+V
+ .LP
+ Brings up an InformationDialog with author and version information.
+-.IP "\fBManual Page...\fP" \n(XYP
++.IP "\fBManual Page...\fP"
+ .B Ctrl+M
+ .LP
+ Brings up a DialogShell with a ScrolledText widget containing this
+@@ -274,7 +274,7 @@ manual page. The command for generating this is custo
+ resource,
+ .IR Mgdiff.manCommand ,
+ which is described in the RESOURCES section.
+-.IP "\fBColor Legend...\fP" \n(XYP
++.IP "\fBColor Legend...\fP"
+ .B Ctrl+G
+ .LP
+ Brings up a DialogShell which summarizes the use of color in encoding
+@@ -414,84 +414,84 @@ Mgdiff mgdiff
+
+ .nr XY 15
+ .SH X RESOURCES
+-.IP "\fBMgdiff.diffForeground:\fP" \n(XYP
++.IP "\fBMgdiff.diffForeground:\fP"
+ .B black
+-.IP "\fBMgdiff.diffBackground:\fP" \n(XYP
++.IP "\fBMgdiff.diffBackground:\fP"
+ .B yellow
+ .LP
+ These colors are for blocks which differ between files.
+
+-.IP "\fBMgdiff.sameForeground:\fP" \n(XYP
++.IP "\fBMgdiff.sameForeground:\fP"
+ .B black
+-.IP "\fBMgdiff.sameBackground:\fP" \n(XYP
++.IP "\fBMgdiff.sameBackground:\fP"
+ .B grey
+ .LP
+ These colors are for blocks which are identical between files.
+
+-.IP "\fBMgdiff.insertForeground:\fP" \n(XYP
++.IP "\fBMgdiff.insertForeground:\fP"
+ .B black
+-.IP "\fBMgdiff.insertBackground:\fP" \n(XYP
++.IP "\fBMgdiff.insertBackground:\fP"
+ .B orange
+ .LP
+ These colors are for blocks which have been inserted in one file.
+
+-.IP "\fBMgdiff.blankForeground:\fP" \n(XYP
++.IP "\fBMgdiff.blankForeground:\fP"
+ .B black
+-.IP "\fBMgdiff.blankBackground:\fP" \n(XYP
++.IP "\fBMgdiff.blankBackground:\fP"
+ .B grey66
+ .LP
+ These colors are for blocks which are for display purposes.
+
+-.IP "\fBMgdiff.selectForeground:\fP" \n(XYP
++.IP "\fBMgdiff.selectForeground:\fP"
+ .B black
+-.IP "\fBMgdiff.selectBackground:\fP" \n(XYP
++.IP "\fBMgdiff.selectBackground:\fP"
+ .B light slate blue
+ .LP
+ These colors are for blocks which have been selected by the user.
+
+-.IP "\fBMgdiff.font:\fP" \n(XYP
++.IP "\fBMgdiff.font:\fP"
+ .B 7x13bold
+ .LP
+ Font for displaying text blocks.
+
+-.IP "\fBMgdiff.dragScroll:\fP" \n(XYP
++.IP "\fBMgdiff.dragScroll:\fP"
+ .B true
+ .LP
+ Set to true if scrollbar dragging should cause immediate changes in
+ the viewed text, and false if the view should only change after the
+ scrollbar has been moved.
+
+-.IP "\fBMgdiff.overview:\fP" \n(XYP
++.IP "\fBMgdiff.overview:\fP"
+ .B true
+ .LP
+ Set to true if the file overview section should appear.
+
+-.IP "\fBMgdiff.horzScrollbar:\fP" \n(XYP
++.IP "\fBMgdiff.horzScrollbar:\fP"
+ .B true
+ .LP
+ Set to true if the horizontal scrollbar should appear.
+
+-.IP "\fBMgdiff.linesOfContext:\fP" \n(XYP
++.IP "\fBMgdiff.linesOfContext:\fP"
+ .B 3
+ .LP
+ Number of lines that should appear above a difference block gotten to
+ using the Previous or Next commands. Should be greater or equal to
+ zero.
+
+-.IP "\fBMgdiff.manCommand:\fP" \n(XYP
++.IP "\fBMgdiff.manCommand:\fP"
+ .B (man mgdiff | col -b) 2>&1
+ .LP
+ The command (or pipeline) used to produce a formatted manual page
+ without escape codes.
+
+-.IP "\fBMgdiff.diffCommand:\fP" \n(XYP
++.IP "\fBMgdiff.diffCommand:\fP"
+ .B diff
+ .LP
+ The
+ .BR diff (1)
+ compatible command to use for calculating differences between text files.
+
+-.IP "\fBMgdiff.diffArgs:\fP" \n(XYP
++.IP "\fBMgdiff.diffArgs:\fP"
+ .B ""
+ .LP
+ The arguments to be provided to the
+@@ -500,7 +500,7 @@ command. This resource can also be set via the
+ .I \-args
+ command line option.
+
+-.IP "\fBMgdiff.quitIfSame:\fP" \n(XYP
++.IP "\fBMgdiff.quitIfSame:\fP"
+ .B false
+ .LP
+ If the two files have no differences (as determined by the
+@@ -510,7 +510,7 @@ resource can also be set to "true" via the
+ .I \-quit
+ command line option.
+
+-.IP "\fBMgdiff.filename:\fP" \n(XYP
++.IP "\fBMgdiff.filename:\fP"
+ .B (stdin)
+ .LP
+ .I mgdiff
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/mgdiff/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Jun 2008 01:45:11 -0000 1.4
+++ pkg/PLIST 23 Oct 2010 16:49:16 -0000
@@ -1,8 +1,7 @@
-...@comment $OpenBSD: PLIST,v 1.4 2008/06/11 01:45:11 ajacoutot Exp $
+...@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:44:03 espie Exp $
@bin bin/mgdiff
lib/X11/app-defaults/Mgdiff
lib/X11/mgdiff/
lib/X11/mgdiff/mgdiff.xbm
lib/X11/mgdiff/mgdiff.xpm
@man man/cat1/mgdiff.0
-...@man man/man1/mgdiff.1
