Attachment #124561 for bug #168046

Lines 7-43 Link Here

(-)textproc/chpp/Makefile (-10 / +34 lines)
7		7
8	PORTNAME= chpp	8	PORTNAME= chpp
9	PORTVERSION= 0.3.5	9	PORTVERSION= 0.3.5
		10	PORTREVISION= 1
10	CATEGORIES= textproc	11	CATEGORIES= textproc
11	MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/chpp/files/ \	12	MASTER_SITES= http://www.complang.tuwien.ac.at/schani/chpp/files/ \
12	http://freebsd.nsu.ru/distfiles/	13	http://freebsd.nsu.ru/distfiles/
13		14
14	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Non-intrusive full-featured text preprocessor	16	COMMENT= Non-intrusive full-featured text preprocessor
16		17
17	GNU_CONFIGURE= yes	18	LICENSE= GPLv2
		19
		20	LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
		21
		22	USE_GMAKE= yes
		23	USE_AUTOTOOLS= autoheader aclocal automake autoconf
		24	AUTOMAKE_ARGS= --add-missing --copy --force-missing
18	CONFIGURE_ARGS= --libdir=${PREFIX}/share	25	CONFIGURE_ARGS= --libdir=${PREFIX}/share
		26	MAKE_JOBS_SAFE= yes
		27
		28	CPPFLAGS+= -I${LOCALBASE}/include
		29	LDFLAGS+= -L${LOCALBASE}/lib
19		30
20	INFO= chpp	31	INFO= chpp
21		32
22	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
23		34
24	.if ${ARCH} != "i386"	35	.if ${ARCH} != "i386" && ${ARCH} != "amd64"
25	BROKEN= Does not compile	36	BROKEN= Does not compile
26	.endif	37	.endif
27		38
		39	post-extract:
		40	.for i in getopt.h regex.h gc/gc.h
		41	@cd ${WRKSRC} && ${MV} -f ${i} ${i}.dist
		42	.endfor
		43
		44	post-patch:
		45	@${REINPLACE_CMD} -e \
		46	's\| getopt.c getopt.h getopt1.c \| \| ; \
		47	s\| regex.c regex.h \| \| ; \
		48	/LDADD/s\| gc/gc.a \| -lgc -lgnuregex \| ; \
		49	s\|^YFLAGS\|AM_YFLAGS\|' ${WRKSRC}/Makefile.am
		50	.for i in arrayops.c builtins.c stringops.c
		51	@${REINPLACE_CMD} -e \
		52	's\|"../regex.h"\|<gnu/regex.h>\|' ${WRKSRC}/builtins/${i}
		53	.endfor
		54
28	post-install:	55	post-install:
29	.if !defined(NOPORTEXAMPLES)
30	@${MKDIR} ${EXAMPLESDIR}
31	${TAR} -C ${WRKSRC}/test -cf - . \| \
32	${TAR} -C ${EXAMPLESDIR} --unlink -xf -
33	@${FIND} ${EXAMPLESDIR} \| ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
34	@${FIND} ${EXAMPLESDIR} -type f \| ${XARGS} ${CHMOD} ${SHAREMODE}
35	.endif
36	.if !defined(NOPORTDOCS)	56	.if !defined(NOPORTDOCS)
37	@${MKDIR} ${DOCSDIR}	57	@${MKDIR} ${DOCSDIR}
38	.for file in AUTHORS NEWS README	58	.for file in AUTHORS NEWS README
39	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	59	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
40	.endfor	60	.endfor
41	.endif	61	.endif
		62	.if !defined(NOPORTEXAMPLES)
		63	@${MKDIR} ${EXAMPLESDIR}
		64	@(cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
		65	.endif
42		66
43	.include <bsd.port.post.mk>	67	.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)textproc/chpp/files/patch-aa (-11 lines)
1	--- gc/mach_dep.c Tue Feb 9 17:03:04 1999
2	+++ /home/andy/tmp/wrk/gc/mach_dep.c Thu Aug 26 08:53:50 1999
3	@@ -170,7 +170,7 @@
4
5	# if defined(I386) &&!defined(OS2) &&!defined(SVR4) &&!defined(MSWIN32) \
6	&& !defined(SCO) && !(defined(LINUX) && defined(__ELF__)) \
7	- && !defined(DOS4GW)
8	+ && !defined(DOS4GW) && !defined(FREEBSD)
9	/* I386 code, generic code does not appear to work */
10	/* It does appear to work under OS2, and asms dont */
11	/* This is used for some 38g UNIX variants and for CYGWIN32 */

Lines 1-24 Link Here

(-)textproc/chpp/files/patch-ab (-24 lines)
1	--- Makefile.in.orig Tue Feb 9 23:02:50 1999
2	+++ Makefile.in Tue Jul 4 04:03:19 2000
3	@@ -471,10 +471,10 @@
4
5
6	gc/gc.a :
7	- ( cd gc ; make gc.a )
8	+ ( cd gc ; $(MAKE) gc.a )
9
10	dist-hook :
11	- ( cd gc ; make clean )
12	+ ( cd gc ; $(MAKE) clean )
13	cp -dR gc $(distdir)
14	rm -rf `find $(distdir)/gc -name CVS`
15	mkdir $(distdir)/test
16	@@ -484,7 +484,7 @@
17	rm -rf `find $(distdir)/test -name CVS`
18
19	clean-gc :
20	- ( cd gc ; make clean )
21	+ ( cd gc ; $(MAKE) clean )
22
23	clean : clean-gc
24




--- gc/Makefile.orig	Tue Feb  9 23:03:04 1999
+++ gc/Makefile	Tue Jul  4 04:04:14 2000
@@ -8,15 +8,15 @@
 #	 c++ interface to gc.a
 # cord/de - builds dumb editor based on cords.
 ABI_FLAG= 
-CC=cc $(ABI_FLAG)
-CXX=CC $(ABI_FLAG)
+CC+= $(ABI_FLAG)
+CXX+= $(ABI_FLAG)
 AS=as $(ABI_FLAG)
 #  The above doesn't work with gas, which doesn't run cpp.
 #  Define AS as `gcc -c -x assembler-with-cpp' instead.
 #  Under Irix 6, you will have to specify the ABI for as if you specify
 #  it for the C compiler.
 
-CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT
+CFLAGS+= -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT
 
 # Setjmp_test may yield overly optimistic results when compiled
 # without optimization.
@@ -98,12 +98,12 @@
 
 
 
-LIBGC_CFLAGS= -O -DNO_SIGNALS -DSILENT \
+LIBGC_CFLAGS= -DNO_SIGNALS -DSILENT \
     -DREDIRECT_MALLOC=GC_malloc_uncollectable \
     -DDONT_ADD_BYTE_AT_END -DALL_INTERIOR_POINTERS
 #   Flags for building libgc.a -- the last two are required.
 
-CXXFLAGS= $(CFLAGS) 
+#CXXFLAGS= $(CFLAGS) 
 AR= ar
 RANLIB= ranlib
 
@@ -168,8 +168,8 @@
 all: gc.a gctest
 
 pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h config.h mach_dep.o $(SRCS)
-	make -f PCR-Makefile depend
-	make -f PCR-Makefile
+	$(MAKE) -f PCR-Makefile depend
+	$(MAKE) -f PCR-Makefile
 
 $(OBJS) test.o dyn_load.o dyn_load_sunos53.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \
     $(srcdir)/config.h $(srcdir)/gc_typed.h Makefile
@@ -189,7 +189,7 @@
 #	ignore ranlib failure; that usually means it doesn't exist, and isn't needed
 
 libgc.a: 
-	make CFLAGS="$(LIBGC_CFLAGS)" clean gc.a gcc_support.o
+	$(MAKE) CFLAGS="$(LIBGC_CFLAGS)" clean gc.a gcc_support.o
 	mv gc.a libgc.a
 	rm -f on_sparc_sunos5
 	./if_mach SPARC SUNOS5 touch on_sparc_sunos5

Lines 17-20 Link Here

(-)textproc/chpp/pkg-descr (-1 / +1 lines)
17	namely lists and hashes (associative arrays), which can be nested	17	namely lists and hashes (associative arrays), which can be nested
18	arbitrarily.	18	arbitrarily.
19		19
20	WWW: http://www.complang.tuwien.ac.at/~schani/chpp/	20	WWW: http://www.complang.tuwien.ac.at/schani/chpp/

Return to bug 168046

Lines 1-56 Link Here

(-)textproc/chpp/files/patch-ac (-56 lines)
1	--- gc/Makefile.orig Tue Feb 9 23:03:04 1999
2	+++ gc/Makefile Tue Jul 4 04:04:14 2000
3	@@ -8,15 +8,15 @@
4	# c++ interface to gc.a
5	# cord/de - builds dumb editor based on cords.
6	ABI_FLAG=
7	-CC=cc $(ABI_FLAG)
8	-CXX=CC $(ABI_FLAG)
9	+CC+= $(ABI_FLAG)
10	+CXX+= $(ABI_FLAG)
11	AS=as $(ABI_FLAG)
12	# The above doesn't work with gas, which doesn't run cpp.
13	# Define AS as `gcc -c -x assembler-with-cpp' instead.
14	# Under Irix 6, you will have to specify the ABI for as if you specify
15	# it for the C compiler.
16
17	-CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT
18	+CFLAGS+= -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT
19
20	# Setjmp_test may yield overly optimistic results when compiled
21	# without optimization.
22	@@ -98,12 +98,12 @@
23
24
25
26	-LIBGC_CFLAGS= -O -DNO_SIGNALS -DSILENT \
27	+LIBGC_CFLAGS= -DNO_SIGNALS -DSILENT \
28	-DREDIRECT_MALLOC=GC_malloc_uncollectable \
29	-DDONT_ADD_BYTE_AT_END -DALL_INTERIOR_POINTERS
30	# Flags for building libgc.a -- the last two are required.
31
32	-CXXFLAGS= $(CFLAGS)
33	+#CXXFLAGS= $(CFLAGS)
34	AR= ar
35	RANLIB= ranlib
36
37	@@ -168,8 +168,8 @@
38	all: gc.a gctest
39
40	pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h config.h mach_dep.o $(SRCS)
41	- make -f PCR-Makefile depend
42	- make -f PCR-Makefile
43	+ $(MAKE) -f PCR-Makefile depend
44	+ $(MAKE) -f PCR-Makefile
45
46	$(OBJS) test.o dyn_load.o dyn_load_sunos53.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \
47	$(srcdir)/config.h $(srcdir)/gc_typed.h Makefile
48	@@ -189,7 +189,7 @@
49	# ignore ranlib failure; that usually means it doesn't exist, and isn't needed
50
51	libgc.a:
52	- make CFLAGS="$(LIBGC_CFLAGS)" clean gc.a gcc_support.o
53	+ $(MAKE) CFLAGS="$(LIBGC_CFLAGS)" clean gc.a gcc_support.o
54	mv gc.a libgc.a
55	rm -f on_sparc_sunos5
56	./if_mach SPARC SUNOS5 touch on_sparc_sunos5