- mkdir -> ${INSTALL_DATA_DIR}
- rename patches and make them unified diffs.
This commit is contained in:
brad
parent
b497bab80e
commit
c426d7e2ce
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2000/10/22 15:43:37 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2001/03/13 16:10:50 brad Exp $
|
||||
|
||||
DISTNAME= mgdiff
|
||||
PKGNAME= mgdiff-1.0
|
||||
CATEGORIES= textproc
|
||||
NEED_VERSION= 1.305
|
||||
NEED_VERSION= 1.336
|
||||
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
|
||||
MASTER_SITE_SUBDIR= applications
|
||||
MASTER_SITE_SUBDIR= applications
|
||||
|
||||
MAINTAINER= ports@openbsd.org
|
||||
|
||||
@ -15,11 +15,11 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_MOTIF= Yes
|
||||
CONFIGURE_STYLE= imake
|
||||
CONFIGURE_STYLE= imake
|
||||
|
||||
post-install:
|
||||
@mkdir -p ${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
|
||||
${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
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
20
textproc/mgdiff/patches/patch-Imakefile
Normal file
20
textproc/mgdiff/patches/patch-Imakefile
Normal file
@ -0,0 +1,20 @@
|
||||
$OpenBSD: patch-Imakefile,v 1.1 2001/03/13 16:10:50 brad Exp $
|
||||
--- 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}
|
||||
+
|
||||
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
|
||||
@ -1,27 +0,0 @@
|
||||
*** Imakefile.orig Thu May 19 04:01:00 1994
|
||||
--- Imakefile Sat Nov 2 17:06:31 1996
|
||||
***************
|
||||
*** 5,14 ****
|
||||
XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
|
||||
|
||||
! XMLIB = -lXm
|
||||
XCOMM
|
||||
! XCOMM for Dell SVR4
|
||||
XCOMM
|
||||
! EXTRA_LIBRARIES = -lc -lucb
|
||||
|
||||
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
|
||||
--- 5,16 ----
|
||||
XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
|
||||
|
||||
! XMLIB = ${MOTIFLIB}
|
||||
+
|
||||
XCOMM
|
||||
! XCOMM The gnuregex library is needed for the Motif file selection box widget.
|
||||
XCOMM
|
||||
! 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
|
||||
@ -1,40 +0,0 @@
|
||||
*** mgdiff.c.orig Thu May 21 21:14:35 1998
|
||||
--- mgdiff.c Thu May 21 21:16:57 1998
|
||||
***************
|
||||
*** 1110,1116 ****
|
||||
*/
|
||||
case 3:
|
||||
if (strcmp (argv[1], "-") == 0) {
|
||||
! tempfname = tempnam (NULL, "mgdif");
|
||||
str_fnamel = strdup (tempfname);
|
||||
str_snamel = strdup (user_filename);
|
||||
if (!copy_to_file (stdin, tempfname)) {
|
||||
--- 1110,1118 ----
|
||||
*/
|
||||
case 3:
|
||||
if (strcmp (argv[1], "-") == 0) {
|
||||
! 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,1137 ****
|
||||
}
|
||||
|
||||
if (strcmp (argv[2], "-") == 0) {
|
||||
! tempfname = tempnam (NULL, "mgdif");
|
||||
str_fnamer = strdup (tempfname);
|
||||
str_snamer = strdup (user_filename);
|
||||
if (!copy_to_file (stdin, tempfname)) {
|
||||
--- 1133,1141 ----
|
||||
}
|
||||
|
||||
if (strcmp (argv[2], "-") == 0) {
|
||||
! 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)) {
|
||||
25
textproc/mgdiff/patches/patch-mgdiff_c
Normal file
25
textproc/mgdiff/patches/patch-mgdiff_c
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-mgdiff_c,v 1.1 2001/03/13 16:10:50 brad Exp $
|
||||
--- 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)) {
|
||||
Loading…
Reference in New Issue
Block a user