diff options
| author | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2013-10-19 11:21:57 +0000 |
|---|---|---|
| committer | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2013-10-19 11:21:57 +0000 |
| commit | d6ba7bc8f2ea7a11657af3116e7be5d8589451c7 (patch) | |
| tree | 980f242c5332834588c7336c610575b926ac60d0 /deskutils | |
| parent | - Fix build with clang with two new patches (diff) | |
fix build error 10-current and use cc
Notes
Notes:
svn path=/head/; revision=330860
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/cal/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/cal/files/patch-aa | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile index 72e39cc79086..431d58a4aecd 100644 --- a/deskutils/cal/Makefile +++ b/deskutils/cal/Makefile @@ -10,8 +10,6 @@ MASTER_SITE_SUBDIR= utils/shell MAINTAINER= sanpei@FreeBSD.org COMMENT= Enhanced color version of standard calendar utility -USE_GCC= any - WRKSRC= ${WRKDIR}/cal-3.5/source MAKEFILE= makefile.unx ALL_TARGET= cal diff --git a/deskutils/cal/files/patch-aa b/deskutils/cal/files/patch-aa index c4e647ffac84..c8fe1c52d76d 100644 --- a/deskutils/cal/files/patch-aa +++ b/deskutils/cal/files/patch-aa @@ -1,15 +1,17 @@ -*** makefile.unx.orig Tue Mar 5 06:36:27 1996 ---- makefile.unx Mon May 12 15:23:42 1997 -*************** -*** 10,15 **** ---- 10,19 ---- - CC=gcc - CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER - -+ .ifdef PREFIX -+ CFLAGS+=-DPREFIX="\"${PREFIX}\"" -+ .endif -+ - BINDIR=/usr/bin - MANDIR=/usr/man - +--- source/makefile.unx.orig 1996-03-05 06:36:27.000000000 +0900 ++++ source/makefile.unx 2013-10-19 20:15:02.149614385 +0900 +@@ -7,9 +7,13 @@ + # To use, enter "make -f makefile.unx" + + RM=rm -f +-CC=gcc ++CC=cc + CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER + ++.ifdef PREFIX ++CFLAGS+=-DPREFIX="\"${PREFIX}\"" ++.endif ++ + BINDIR=/usr/bin + MANDIR=/usr/man + |