Attachment 124561 Details for Bug 168046 – textproc_chpp.diff

[patch] textproc_chpp.diff

textproc_chpp.diff (text/x-diff), 6.01 KB, created by tkato432 on 2012-05-21 19:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-05-21 19:30:01 UTC

Size: 6.01 KB

patch

obsolete

>diff -urN /usr/ports/textproc/chpp/Makefile textproc/chpp/Makefile
>--- /usr/ports/textproc/chpp/Makefile	2007-07-02 19:18:19.000000000 +0900
>+++ textproc/chpp/Makefile	2012-05-22 03:28:36.000000000 +0900
>@@ -7,37 +7,61 @@
> 
> PORTNAME=	chpp
> PORTVERSION=	0.3.5
>+PORTREVISION=	1
> CATEGORIES=	textproc
>-MASTER_SITES=	http://www.complang.tuwien.ac.at/~schani/chpp/files/ \
>+MASTER_SITES=	http://www.complang.tuwien.ac.at/schani/chpp/files/ \
> 		http://freebsd.nsu.ru/distfiles/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Non-intrusive full-featured text preprocessor
> 
>-GNU_CONFIGURE=	yes
>+LICENSE=	GPLv2
>+
>+LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
>+
>+USE_GMAKE=	yes
>+USE_AUTOTOOLS=	autoheader aclocal automake autoconf
>+AUTOMAKE_ARGS=	--add-missing --copy --force-missing
> CONFIGURE_ARGS=	--libdir=${PREFIX}/share
>+MAKE_JOBS_SAFE=	yes
>+
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> INFO=		chpp
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} != "i386"
>+.if ${ARCH} != "i386" && ${ARCH} != "amd64"
> BROKEN=		Does not compile
> .endif
> 
>+post-extract:
>+.for i in getopt.h regex.h gc/gc.h
>+	@cd ${WRKSRC} && ${MV} -f ${i} ${i}.dist
>+.endfor
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		's| getopt.c getopt.h getopt1.c | | ; \
>+		 s| regex.c regex.h | | ; \
>+		 /LDADD/s| gc/gc.a | -lgc -lgnuregex | ; \
>+		 s|^YFLAGS|AM_YFLAGS|' ${WRKSRC}/Makefile.am
>+.for i in arrayops.c builtins.c stringops.c
>+	@${REINPLACE_CMD} -e \
>+		's|"../regex.h"|<gnu/regex.h>|' ${WRKSRC}/builtins/${i}
>+.endfor
>+
> post-install:
>-.if !defined(NOPORTEXAMPLES)
>-	@${MKDIR} ${EXAMPLESDIR}
>-	${TAR} -C ${WRKSRC}/test -cf - . | \
>-		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
>-	@${FIND} ${EXAMPLESDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
>-	@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
>-.endif
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for file in AUTHORS NEWS README
> 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
> .endfor
> .endif
>+.if !defined(NOPORTEXAMPLES)
>+	@${MKDIR} ${EXAMPLESDIR}
>+	@(cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/textproc/chpp/files/patch-aa textproc/chpp/files/patch-aa
>--- /usr/ports/textproc/chpp/files/patch-aa	1999-12-29 21:33:57.000000000 +0900
>+++ textproc/chpp/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- gc/mach_dep.c	Tue Feb  9 17:03:04 1999
>-+++ /home/andy/tmp/wrk/gc/mach_dep.c	Thu Aug 26 08:53:50 1999
>-@@ -170,7 +170,7 @@
>- 
>- #       if defined(I386) &&!defined(OS2) &&!defined(SVR4) &&!defined(MSWIN32) \
>- 	&& !defined(SCO) && !(defined(LINUX) && defined(__ELF__)) \
>--	&& !defined(DOS4GW)
>-+	&& !defined(DOS4GW) && !defined(FREEBSD)
>- 	/* I386 code, generic code does not appear to work */
>- 	/* It does appear to work under OS2, and asms dont */
>- 	/* This is used for some 38g UNIX variants and for CYGWIN32 */
>diff -urN /usr/ports/textproc/chpp/files/patch-ab textproc/chpp/files/patch-ab
>--- /usr/ports/textproc/chpp/files/patch-ab	2000-07-08 09:26:15.000000000 +0900
>+++ textproc/chpp/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
>@@ -1,24 +0,0 @@
>---- Makefile.in.orig	Tue Feb  9 23:02:50 1999
>-+++ Makefile.in	Tue Jul  4 04:03:19 2000
>-@@ -471,10 +471,10 @@
>- 
>- 
>- gc/gc.a :
>--	( cd gc ; make gc.a )
>-+	( cd gc ; $(MAKE) gc.a )
>- 
>- dist-hook :
>--	( cd gc ; make clean )
>-+	( cd gc ; $(MAKE) clean )
>- 	cp -dR gc $(distdir)
>- 	rm -rf `find $(distdir)/gc -name CVS`
>- 	mkdir $(distdir)/test
>-@@ -484,7 +484,7 @@
>- 	rm -rf `find $(distdir)/test -name CVS`
>- 
>- clean-gc :
>--	( cd gc ; make clean )
>-+	( cd gc ; $(MAKE) clean )
>- 
>- clean : clean-gc
>- 
>diff -urN /usr/ports/textproc/chpp/files/patch-ac textproc/chpp/files/patch-ac
>--- /usr/ports/textproc/chpp/files/patch-ac	2000-07-08 09:26:15.000000000 +0900
>+++ textproc/chpp/files/patch-ac	1970-01-01 09:00:00.000000000 +0900
>@@ -1,56 +0,0 @@
>---- 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
>diff -urN /usr/ports/textproc/chpp/pkg-descr textproc/chpp/pkg-descr
>--- /usr/ports/textproc/chpp/pkg-descr	2007-07-02 19:07:53.000000000 +0900
>+++ textproc/chpp/pkg-descr	2012-04-20 23:43:12.000000000 +0900
>@@ -17,4 +17,4 @@
>      namely lists and hashes (associative arrays), which can be nested
>      arbitrarily.
> 
>-WWW: http://www.complang.tuwien.ac.at/~schani/chpp/
>+WWW: http://www.complang.tuwien.ac.at/schani/chpp/

Actions: View | Diff

Attachments on bug 168046: 124560 | 124561