Index: head/lang/cocor/Makefile =================================================================== --- head/lang/cocor/Makefile (revision 421011) +++ head/lang/cocor/Makefile (revision 421012) @@ -1,57 +1,61 @@ # Created by: Guy Antony Halse # $FreeBSD$ PORTNAME= cocor PORTVERSION= 1.7 PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= ftp://ftp.psg.com/pub/modula-2/coco/ \ ftp://ftp.ssw.uni-linz.ac.at/pub/Coco/C/ \ http://www.scifac.ru.ac.za/coco/ DISTNAME= ${PORTNAME}c${PORTVERSION:S/.//} MAINTAINER= ports@FreeBSD.org COMMENT= Compiler generator that combines the functionality of lex and yacc NO_WRKSUBDIR= yes USES= dos2unix tar:tgz MAKE_ENV= CRFRAMES="${WRKSRC}/frames" MAKEFILE= unix.mk ALL_TARGET= all1 OPTIONS_DEFINE= DOCS EXAMPLES post-patch: .for i in sources/unix.mk taste/unix.mk @${REINPLACE_CMD} -e 's|^CFLAGS|#CFLAGS|' ${WRKSRC}/${i} .endfor .for i in cplus2 taste taste_cp @${RM} -f ${WRKSRC}/${i}/unix.mk.* .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}; ${COPYTREE_SHARE} "cplus2 taste taste_cp" \ + (cd ${WRKSRC} && ${COPYTREE_SHARE} "cplus2 taste taste_cp" \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/frames; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/coco.use ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/cocol ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/samples/*.atg ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/samples/*.inp ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/frames && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) .for f in xref pretty taste ${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/cocor/taste/${f} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cocor/taste/${f} ${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/cocor/taste/${f} ${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/cocor/taste_cp/${f} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cocor/taste_cp/${f} ${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/cocor/taste_cp/${f} .endfor + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/coco.use ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/cocol ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/*.atg ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/*.inp ${STAGEDIR}${EXAMPLESDIR} .include Index: head/lang/cocor/files/patch-cplus2__unix.mk =================================================================== --- head/lang/cocor/files/patch-cplus2__unix.mk (revision 421011) +++ head/lang/cocor/files/patch-cplus2__unix.mk (revision 421012) @@ -1,30 +1,30 @@ ---- cplus2/unix.mk.orig 1999-11-21 15:27:41.000000000 +0900 -+++ cplus2/unix.mk 2010-01-26 03:46:07.000000000 +0900 +--- cplus2/unix.mk.orig 1999-11-21 06:27:41 UTC ++++ cplus2/unix.mk @@ -11,16 +11,16 @@ #CC sets the name of the compiler to use (cc, gcc, etc) #You will have to change this to suit your system -#CC = g++ +CC = ${CXX} AR = ar -CFLAGS = -g +CFLAGS = ${CXXFLAGS} DOS2UNIX = ../dos2unix.sh -%.o: %.cpp +.cpp.o: $(CC) -c $(CFLAGS) $< -o $@ -%.o: %.cxx +.cxx.o: $(CC) -c $(CFLAGS) $< -o $@ all: cr_lib.a -@@ -46,3 +46,6 @@ +@@ -46,3 +46,6 @@ clean: \rm -f *.o \rm -f *.a + + + Index: head/lang/cocor/files/patch-taste-unix.mk =================================================================== --- head/lang/cocor/files/patch-taste-unix.mk (revision 421011) +++ head/lang/cocor/files/patch-taste-unix.mk (revision 421012) @@ -1,29 +1,29 @@ ---- taste/unix.mk.orig 2009-03-25 13:30:16.000000000 +0100 -+++ taste/unix.mk 2009-03-25 13:30:36.000000000 +0100 -@@ -27,7 +27,7 @@ +--- taste/unix.mk.orig 1999-11-21 06:34:03 UTC ++++ taste/unix.mk +@@ -27,7 +27,7 @@ taste: tastep.o taste.o tc.o tl $(CC) $(CFLAGS) -otaste taste.o tl.o tc.o\ tastes.o tastep.o -tastep.o: taste.atg +tastep.o taste.o: taste.atg $(COCOR) taste.atg $(CC) $(CFLAGS) -c taste.c tastep.c tastes.c -@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@ pretty: prettyp.o pretty.o prett $(CC) $(CFLAGS) -opretty pretty.o prettypr.o \ prettys.o prettyp.o -prettyp.o: pretty.atg +prettyp.o pretty.o: pretty.atg $(COCOR) pretty.atg $(CC) $(CFLAGS) -c pretty.c prettyp.c prettys.c -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ xref: xrefp.o xref.o crossref. $(CC) $(CFLAGS) -oxref xref.o crossref.o \ xrefs.o xrefp.o -xrefp.o: xref.atg +xrefp.o xref.o: xref.atg $(COCOR) xref.atg $(CC) $(CFLAGS) -c xref.c xrefp.c xrefs.c Index: head/lang/cocor/files/patch-taste_cp__unix.mk =================================================================== --- head/lang/cocor/files/patch-taste_cp__unix.mk (revision 421011) +++ head/lang/cocor/files/patch-taste_cp__unix.mk (revision 421012) @@ -1,51 +1,51 @@ ---- taste_cp/unix.mk.orig 1999-11-21 15:34:48.000000000 +0900 -+++ taste_cp/unix.mk 2010-01-26 03:48:40.000000000 +0900 +--- taste_cp/unix.mk.orig 1999-11-21 06:34:48 UTC ++++ taste_cp/unix.mk @@ -8,17 +8,17 @@ #CC sets the name of the compiler to use (cc, gcc, etc) #You will have to change this to suit your system -#CC = g++ +CC = ${CXX} -CFLAGS = -g -I../cplus2 +CFLAGS = -I../cplus2 ${CXXFLAGS} COCOR = ../cocor DOS2UNIX = ../dos2unix.sh LIB = ../cplus2/cr_lib.a -%.o: %.cpp +.cpp.o: $(CC) -c $(CFLAGS) $< -o $@ -%.o: %.cxx +.cxx.o: $(CC) -c $(CFLAGS) $< -o $@ all: taste pretty xref -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ taste: tastep.o taste.o tc.o t $(CC) $(CFLAGS) -otaste taste.o tl.o tc.o\ tastes.o tastep.o $(LIB) -tastep.o: taste.atg +tastep.o taste.o: taste.atg $(COCOR) taste.atg $(CC) $(CFLAGS) -c taste.c?? tastep.c?? tastes.c?? -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ pretty: prettyp.o pretty.o prett $(CC) $(CFLAGS) -opretty pretty.o prettypr.o \ prettys.o prettyp.o $(LIB) -prettyp.o: pretty.atg +prettyp.o pretty.o: pretty.atg $(COCOR) pretty.atg $(CC) $(CFLAGS) -c pretty.c?? prettyp.c?? prettys.c?? -@@ -54,7 +54,7 @@ +@@ -54,7 +54,7 @@ xref: xrefp.o xref.o crossref. $(CC) $(CFLAGS) -oxref xref.o crossref.o \ xrefs.o xrefp.o $(LIB) -xrefp.o: xref.atg +xrefp.o xref.o: xref.atg $(COCOR) xref.atg $(CC) $(CFLAGS) -c xref.c?? xrefp.c?? xrefs.c?? Index: head/lang/cocor/files/patch-unix.mk =================================================================== --- head/lang/cocor/files/patch-unix.mk (revision 421011) +++ head/lang/cocor/files/patch-unix.mk (revision 421012) @@ -1,20 +1,20 @@ ---- unix.mk.orig 1998-04-16 00:48:11.000000000 +0900 -+++ unix.mk 2012-07-09 16:52:30.000000000 +0900 +--- unix.mk.orig 1998-04-15 15:48:11 UTC ++++ unix.mk @@ -13,7 +13,7 @@ # solaris Set environment variables for Sun with Solaris 2.X # and gnu C/C++ -MAKE = make +#MAKE = make DOS2UNIX = ./dos2unix.sh SUBDIRS = sources taste cplus2 taste_cp SUBDIRS2 = docs frames frames/cplus2 cplus2 samples -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ help: all1: set -e; \ for i in $(SUBDIRS);\ - do (cd $$i; $(MAKE) -f unix.mk)\ + do (echo "===> $$i"; cd $$i; $(MAKE) -f unix.mk)\ done linux: ;$(MAKE) -f unix.mk CC=cc all1