SecBSD's official ports repository
This commit is contained in:
commit
2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
25
textproc/mgdiff/Makefile
Normal file
25
textproc/mgdiff/Makefile
Normal file
|
@ -0,0 +1,25 @@
|
|||
COMMENT= graphical front end to Unix diff
|
||||
|
||||
DISTNAME= mgdiff
|
||||
PKGNAME= ${DISTNAME}-1.0
|
||||
REVISION= 7
|
||||
CATEGORIES= textproc
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
|
||||
|
||||
# X11
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xmu Xt c m Xm
|
||||
|
||||
LIB_DEPENDS+= x11/motif
|
||||
CONFIGURE_STYLE=imake
|
||||
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/mgdiff
|
||||
${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${PREFIX}/lib/X11/mgdiff
|
||||
|
||||
.include <bsd.port.mk>
|
2
textproc/mgdiff/distinfo
Normal file
2
textproc/mgdiff/distinfo
Normal file
|
@ -0,0 +1,2 @@
|
|||
SHA256 (mgdiff.tar.gz) = GaaL1aXeKHygOV94gdQrFedsP6+y9A78/RypgCaO9aw=
|
||||
SIZE (mgdiff.tar.gz) = 41187
|
19
textproc/mgdiff/patches/patch-Imakefile
Normal file
19
textproc/mgdiff/patches/patch-Imakefile
Normal file
|
@ -0,0 +1,19 @@
|
|||
--- Imakefile.orig Wed May 18 22:01:00 1994
|
||||
+++ Imakefile Tue Mar 13 10:54:29 2001
|
||||
@@ -4,11 +4,13 @@
|
||||
|
||||
XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
|
||||
|
||||
-XMLIB = -lXm
|
||||
+XMLIB = ${MOTIFLIB} -lm
|
||||
+
|
||||
XCOMM
|
||||
-XCOMM for Dell SVR4
|
||||
+XCOMM The gnuregex library is needed for the Motif file selection box widget.
|
||||
XCOMM
|
||||
-EXTRA_LIBRARIES = -lc -lucb
|
||||
+XCOMM
|
||||
+EXTRA_LIBRARIES =
|
||||
|
||||
SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c
|
||||
OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o
|
24
textproc/mgdiff/patches/patch-mgdiff_c
Normal file
24
textproc/mgdiff/patches/patch-mgdiff_c
Normal file
|
@ -0,0 +1,24 @@
|
|||
--- mgdiff.c.orig Wed Sep 28 21:56:53 1994
|
||||
+++ mgdiff.c Tue Mar 13 10:54:30 2001
|
||||
@@ -1110,7 +1110,9 @@ int main (int argc, char *argv[])
|
||||
*/
|
||||
case 3:
|
||||
if (strcmp (argv[1], "-") == 0) {
|
||||
- tempfname = tempnam (NULL, "mgdif");
|
||||
+ char xxx[20];
|
||||
+ sprintf(tempfname, "mgdif.XXXXXXXX");
|
||||
+ close(mkstemp (tempfname));
|
||||
str_fnamel = strdup (tempfname);
|
||||
str_snamel = strdup (user_filename);
|
||||
if (!copy_to_file (stdin, tempfname)) {
|
||||
@@ -1131,7 +1133,9 @@ int main (int argc, char *argv[])
|
||||
}
|
||||
|
||||
if (strcmp (argv[2], "-") == 0) {
|
||||
- tempfname = tempnam (NULL, "mgdif");
|
||||
+ char xxx[20];
|
||||
+ sprintf(tempfname, "mgdif.XXXXXXXX");
|
||||
+ close(mkstemp (tempfname));
|
||||
str_fnamer = strdup (tempfname);
|
||||
str_snamer = strdup (user_filename);
|
||||
if (!copy_to_file (stdin, tempfname)) {
|
92
textproc/mgdiff/patches/patch-rundiff_c
Normal file
92
textproc/mgdiff/patches/patch-rundiff_c
Normal file
|
@ -0,0 +1,92 @@
|
|||
--- rundiff.c.orig Sat Mar 17 11:47:07 2012
|
||||
+++ rundiff.c Sat Mar 17 11:47:46 2012
|
||||
@@ -63,7 +63,7 @@ typedef enum { ADD = 1, CHANGE, DELETE, IGNORE, ERROR}
|
||||
static char *duplicate (char *s, int *flag);
|
||||
static DiffType parse_diff_line (char *buf, int *f1n1, int *f1n2, int *f2n1, int *f2n2);
|
||||
static int eatline (FILE *f);
|
||||
-static void getline (FILE *f, char **cooked, char **raw);
|
||||
+static void get_line (FILE *f, char **cooked, char **raw);
|
||||
static void reset_blist (void);
|
||||
static Block *get_blist (void);
|
||||
static void add_blist (Block *b);
|
||||
@@ -271,7 +271,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -300,7 +300,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[RIGHT].wtext = (char **) calloc (b->arr[RIGHT].fsize, sizeof (char *));
|
||||
b->arr[RIGHT].tlen = (short *) calloc (b->arr[RIGHT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[RIGHT].fsize; i++) {
|
||||
- getline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]);
|
||||
+ get_line (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]);
|
||||
b->arr[RIGHT].tlen[i] = strlen (b->arr[RIGHT].text[i]);
|
||||
if (di->maxcols < b->arr[RIGHT].tlen[i]) {
|
||||
di->maxcols = b->arr[RIGHT].tlen[i];
|
||||
@@ -331,7 +331,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -358,7 +358,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -371,7 +371,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[RIGHT].wtext = (char **) calloc (b->arr[RIGHT].fsize, sizeof (char *));
|
||||
b->arr[RIGHT].tlen = (short *) calloc (b->arr[RIGHT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[RIGHT].fsize; i++) {
|
||||
- getline (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]);
|
||||
+ get_line (file2, &b->arr[RIGHT].text[i], &b->arr[RIGHT].wtext[i]);
|
||||
b->arr[RIGHT].tlen[i] = strlen (b->arr[RIGHT].text[i]);
|
||||
if (di->maxcols < b->arr[RIGHT].tlen[i]) {
|
||||
di->maxcols = b->arr[RIGHT].tlen[i];
|
||||
@@ -399,7 +399,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -428,7 +428,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file1, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -491,7 +491,7 @@ DiffInfo *build_diff_info (char *prog, char *args, cha
|
||||
b->arr[LEFT].wtext = (char **) calloc (b->arr[LEFT].fsize, sizeof (char *));
|
||||
b->arr[LEFT].tlen = (short *) calloc (b->arr[LEFT].fsize, sizeof (short));
|
||||
for (i = 0; i < b->arr[LEFT].fsize; i++) {
|
||||
- getline (file2, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
+ get_line (file2, &b->arr[LEFT].text[i], &b->arr[LEFT].wtext[i]);
|
||||
b->arr[LEFT].tlen[i] = strlen (b->arr[LEFT].text[i]);
|
||||
if (di->maxcols < b->arr[LEFT].tlen[i]) {
|
||||
di->maxcols = b->arr[LEFT].tlen[i];
|
||||
@@ -663,7 +663,7 @@ static int eatline (FILE *f)
|
||||
* printable) if necessary. Silently truncate input lines at BUFSIZ
|
||||
* characters.
|
||||
*/
|
||||
-static void getline (FILE *f, char **cooked, char **raw)
|
||||
+static void get_line (FILE *f, char **cooked, char **raw)
|
||||
{
|
||||
char buffer[BUFSIZ+1];
|
||||
char *s;
|
9
textproc/mgdiff/pkg/DESCR
Normal file
9
textproc/mgdiff/pkg/DESCR
Normal file
|
@ -0,0 +1,9 @@
|
|||
This is mgdiff, a graphical front end to the Unix diff command based
|
||||
upon X11R[456] and the Motif widget set. It allows the user to select
|
||||
two files for comparison, runs the diff command, parses the output and
|
||||
presents the results graphically. This presentation can also be used
|
||||
to generate a user-specified merge of the two files into a third file.
|
||||
|
||||
This program's appearance is based upon a program called gdiff, which
|
||||
runs only on Silicon Graphics workstations and for which source code
|
||||
is not provided.
|
2
textproc/mgdiff/pkg/MESSAGE
Normal file
2
textproc/mgdiff/pkg/MESSAGE
Normal file
|
@ -0,0 +1,2 @@
|
|||
Mgdiff comes with .xbm and .xpm files for use as window
|
||||
manager icons. You will find them under ${PREFIX}/lib/X11/mgdiff.
|
7
textproc/mgdiff/pkg/PLIST
Normal file
7
textproc/mgdiff/pkg/PLIST
Normal file
|
@ -0,0 +1,7 @@
|
|||
@pkgpath textproc/mgdiff,lesstif
|
||||
@bin bin/mgdiff
|
||||
lib/X11/app-defaults/Mgdiff
|
||||
lib/X11/mgdiff/
|
||||
lib/X11/mgdiff/mgdiff.xbm
|
||||
lib/X11/mgdiff/mgdiff.xpm
|
||||
@man man/man1/mgdiff.1
|
Loading…
Add table
Add a link
Reference in a new issue