svn commit: r421012 - in head/lang/cocor: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Aug 28 09:01:21 UTC 2016
Author: amdmi3
Date: Sun Aug 28 09:01:20 2016
New Revision: 421012
URL: https://svnweb.freebsd.org/changeset/ports/421012
Log:
- Switch to options helpers
- Regenerate patches with `make makepatch`
Modified:
head/lang/cocor/Makefile
head/lang/cocor/files/patch-cplus2__unix.mk
head/lang/cocor/files/patch-taste-unix.mk
head/lang/cocor/files/patch-taste_cp__unix.mk
head/lang/cocor/files/patch-unix.mk
Modified: head/lang/cocor/Makefile
==============================================================================
--- head/lang/cocor/Makefile Sun Aug 28 08:05:47 2016 (r421011)
+++ head/lang/cocor/Makefile Sun Aug 28 09:01:20 2016 (r421012)
@@ -35,16 +35,10 @@ do-install:
${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}
@@ -54,4 +48,14 @@ do-install:
${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 <bsd.port.mk>
Modified: head/lang/cocor/files/patch-cplus2__unix.mk
==============================================================================
--- head/lang/cocor/files/patch-cplus2__unix.mk Sun Aug 28 08:05:47 2016 (r421011)
+++ head/lang/cocor/files/patch-cplus2__unix.mk Sun Aug 28 09:01:20 2016 (r421012)
@@ -1,5 +1,5 @@
---- 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)
@@ -21,7 +21,7 @@
$(CC) -c $(CFLAGS) $< -o $@
all: cr_lib.a
-@@ -46,3 +46,6 @@
+@@ -46,3 +46,6 @@ clean:
\rm -f *.o
\rm -f *.a
Modified: head/lang/cocor/files/patch-taste-unix.mk
==============================================================================
--- head/lang/cocor/files/patch-taste-unix.mk Sun Aug 28 08:05:47 2016 (r421011)
+++ head/lang/cocor/files/patch-taste-unix.mk Sun Aug 28 09:01:20 2016 (r421012)
@@ -1,6 +1,6 @@
---- 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
@@ -9,7 +9,7 @@
$(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
@@ -18,7 +18,7 @@
$(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
Modified: head/lang/cocor/files/patch-taste_cp__unix.mk
==============================================================================
--- head/lang/cocor/files/patch-taste_cp__unix.mk Sun Aug 28 08:05:47 2016 (r421011)
+++ head/lang/cocor/files/patch-taste_cp__unix.mk Sun Aug 28 09:01:20 2016 (r421012)
@@ -1,5 +1,5 @@
---- 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)
@@ -22,7 +22,7 @@
$(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)
@@ -31,7 +31,7 @@
$(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)
@@ -40,7 +40,7 @@
$(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)
Modified: head/lang/cocor/files/patch-unix.mk
==============================================================================
--- head/lang/cocor/files/patch-unix.mk Sun Aug 28 08:05:47 2016 (r421011)
+++ head/lang/cocor/files/patch-unix.mk Sun Aug 28 09:01:20 2016 (r421012)
@@ -1,5 +1,5 @@
---- 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++
@@ -9,7 +9,7 @@
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);\
More information about the svn-ports-head
mailing list