Attachment #48516 for bug #74245

View | Details | Raw Unified | Return to bug 74245
Collapse All | Expand All




#

PORTNAME=	open-cobol
PORTVERSION=	0.30
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


USE_LIBLTDL=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
USE_LIBTOOL_VER=	15
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--with-readline
INSTALLS_SHLIB=	yes

INFO=		open-cobol

PLIST_SUB+=	NLS="@comment "
.else
USE_GETTEXT=	yes
LDFLAGS+=	-lintl
PLIST_SUB+=	NLS=""
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|^SUBDIRS = lib |SUBDIRS = |g' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|$$(top_builddir)/lib/libsupport\.a||g' \
		${WRKSRC}/cobc/Makefile.in
	@${REINPLACE_CMD} -e 's|"lib/getopt\.h"|<getopt.h>|g' \
		${WRKSRC}/cobc/cobc.c

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)lang/open-cobol/distinfo (-2 / +2 lines)
1	MD5 (open-cobol-0.23.tar.gz) = a253ca8965dd071c517d3860e9730137	1	MD5 (open-cobol-0.30.tar.gz) = 8945775abca6703bba0a25a3293f78ac
2	SIZE (open-cobol-0.23.tar.gz) = 658911	2	SIZE (open-cobol-0.30.tar.gz) = 738437

Lines 1-11 Link Here

(-)lang/open-cobol/files/patch-cobc::cobc.c (-11 lines)
1	--- cobc/cobc.c.orig Thu Jun 5 09:02:15 2003
2	+++ cobc/cobc.c Sun Apr 4 00:32:21 2004
3	@@ -36,7 +36,7 @@
4
5	#include "cobc.h"
6	#include "tree.h"
7	-#include "lib/getopt.h"
8	+#include <getopt.h>
9
10
11	/*




--- config/ltmain.sh.orig	Fri Nov 22 17:03:54 2002
+++ config/ltmain.sh	Thu Dec 12 20:35:02 2002
@@ -4280,10 +4280,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"




--- lib/Makefile.in.orig	Thu Jun 12 05:13:50 2003
+++ lib/Makefile.in	Sun Apr  4 00:28:58 2004
@@ -175,7 +175,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
+@AMDEP_TRUE@DEP_FILES = \
 @AMDEP_TRUE@	$(DEPDIR)/malloc.Po $(DEPDIR)/memcmp.Po \
 @AMDEP_TRUE@	$(DEPDIR)/realloc.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -215,8 +215,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@




--- libcob/fileio.c.orig	Wed Jun 11 15:40:20 2003
+++ libcob/fileio.c	Wed Aug 27 09:57:31 2003
@@ -202,13 +202,10 @@
   else
     {
       /* discard input until the next newline */
-      int c = getc (f->file);
-      while (c != '\r' && c != '\n' && c != EOF)
-	c = getc (f->file);
-      if (c == '\r')
-	c = getc (f->file);
-      if (c != '\n' && c != EOF)
-	ungetc (c, f->file);
+      char buff[BUFSIZ];
+      while (fgets (buff, BUFSIZ, f->file) !=NULL)
+	if (strchr (buff, '\n') != NULL)
+	  break;
     }
 
   memcpy (f->record->data, buff, f->record->size);

Lines 1-10 Link Here

(-)lang/open-cobol/files/patch-libcob::screenio.c (-10 lines)
1	--- libcob/screenio.c.orig Thu Apr 3 06:02:51 2003
2	+++ libcob/screenio.c Tue Apr 29 04:09:44 2003
3	@@ -19,6 +19,7 @@
4
5	#include "config.h"
6
7	+#include <sys/types.h>
8	#include <string.h>
9	#if HAVE_CURSES_H
10	#include <curses.h>

Lines 1-7 Link Here

(-)lang/open-cobol/pkg-plist (-1 / +10 lines)
1	bin/cob-config	1	bin/cob-config
2	bin/cobc	2	bin/cobc
3	etc/libcob.conf
4	include/libcob.h	3	include/libcob.h
		4	include/libcob/byteswap.h
5	include/libcob/call.h	5	include/libcob/call.h
6	include/libcob/common.h	6	include/libcob/common.h
7	include/libcob/exception.def	7	include/libcob/exception.def
Lines 15-18 Link Here
15	lib/libcob.so	15	lib/libcob.so
16	lib/libcob.so.1	16	lib/libcob.so.1
17	%%NLS%%share/locale/ja/LC_MESSAGES/open-cobol.mo	17	%%NLS%%share/locale/ja/LC_MESSAGES/open-cobol.mo
		18	%%DATADIR%%/config/cobol2002.conf
		19	%%DATADIR%%/config/cobol85.conf
		20	%%DATADIR%%/config/default.conf
		21	%%DATADIR%%/config/ibm.conf
		22	%%DATADIR%%/config/mf.conf
		23	%%DATADIR%%/config/mvs.conf
		24	%%DATADIR%%/config/v023.conf
		25	@dirrm %%DATADIR%%/config
		26	@dirrm %%DATADIR%%
18	@dirrm include/libcob	27	@dirrm include/libcob

Return to bug 74245

Lines 7-14 Link Here

(-)lang/open-cobol/Makefile (-5 / +11 lines)
7	#	7	#
8		8
9	PORTNAME= open-cobol	9	PORTNAME= open-cobol
10	PORTVERSION= 0.23	10	PORTVERSION= 0.30
11	PORTREVISION= 1
12	CATEGORIES= lang	11	CATEGORIES= lang
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 20-29 Link Here
20		19
21	USE_LIBLTDL= yes	20	USE_LIBLTDL= yes
22	USE_GETOPT_LONG= yes	21	USE_GETOPT_LONG= yes
23	GNU_CONFIGURE= yes	22	USE_REINPLACE= yes
		23	USE_LIBTOOL_VER= 15
24	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	24	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
26	CONFIGURE_ARGS= --with-readline
27	INSTALLS_SHLIB= yes	26	INSTALLS_SHLIB= yes
28		27
29	INFO= open-cobol	28	INFO= open-cobol
Lines 36-43 Link Here
36	PLIST_SUB+= NLS="@comment "	35	PLIST_SUB+= NLS="@comment "
37	.else	36	.else
38	USE_GETTEXT= yes	37	USE_GETTEXT= yes
39	LDFLAGS+= -lintl
40	PLIST_SUB+= NLS=""	38	PLIST_SUB+= NLS=""
41	.endif	39	.endif
		40
		41	post-patch:
		42	@${REINPLACE_CMD} -e 's\|^SUBDIRS = lib \|SUBDIRS = \|g' \
		43	${WRKSRC}/Makefile.in
		44	@${REINPLACE_CMD} -e 's\|$$(top_builddir)/lib/libsupport\.a\|\|g' \
		45	${WRKSRC}/cobc/Makefile.in
		46	@${REINPLACE_CMD} -e 's\|"lib/getopt\.h"\|<getopt.h>\|g' \
		47	${WRKSRC}/cobc/cobc.c
42		48
43	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)lang/open-cobol/files/patch-config::ltmain.sh (-15 lines)
1	--- config/ltmain.sh.orig Fri Nov 22 17:03:54 2002
2	+++ config/ltmain.sh Thu Dec 12 20:35:02 2002
3	@@ -4280,10 +4280,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-20 Link Here

(-)lang/open-cobol/files/patch-lib::Makefile.in (-20 lines)
1	--- lib/Makefile.in.orig Thu Jun 12 05:13:50 2003
2	+++ lib/Makefile.in Sun Apr 4 00:28:58 2004
3	@@ -175,7 +175,7 @@
4	DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
5	depcomp = $(SHELL) $(top_srcdir)/config/depcomp
6	am__depfiles_maybe = depfiles
7	-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
8	+@AMDEP_TRUE@DEP_FILES = \
9	@AMDEP_TRUE@ $(DEPDIR)/malloc.Po $(DEPDIR)/memcmp.Po \
10	@AMDEP_TRUE@ $(DEPDIR)/realloc.Po
11	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12	@@ -215,8 +215,6 @@
13	distclean-compile:
14	-rm -f *.tab.c
15
16	-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
17	-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
18	@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
19	@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcmp.Po@am__quote@
20	@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@

Lines 1-20 Link Here

(-)lang/open-cobol/files/patch-libcob::fileio.c (-20 lines)
1	--- libcob/fileio.c.orig Wed Jun 11 15:40:20 2003
2	+++ libcob/fileio.c Wed Aug 27 09:57:31 2003
3	@@ -202,13 +202,10 @@
4	else
5	{
6	/* discard input until the next newline */
7	- int c = getc (f->file);
8	- while (c != '\r' && c != '\n' && c != EOF)
9	- c = getc (f->file);
10	- if (c == '\r')
11	- c = getc (f->file);
12	- if (c != '\n' && c != EOF)
13	- ungetc (c, f->file);
14	+ char buff[BUFSIZ];
15	+ while (fgets (buff, BUFSIZ, f->file) !=NULL)
16	+ if (strchr (buff, '\n') != NULL)
17	+ break;
18	}
19
20	memcpy (f->record->data, buff, f->record->size);