Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 May 2013 19:05:17 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317232 - in head/print/c2ps: . files
Message-ID:  <201305031905.r43J5HNK093550@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Fri May  3 19:05:17 2013
New Revision: 317232
URL: http://svnweb.freebsd.org/changeset/ports/317232

Log:
  Style fix.

Modified:
  head/print/c2ps/Makefile
  head/print/c2ps/files/patch-Makefile

Modified: head/print/c2ps/Makefile
==============================================================================
--- head/print/c2ps/Makefile	Fri May  3 18:57:53 2013	(r317231)
+++ head/print/c2ps/Makefile	Fri May  3 19:05:17 2013	(r317232)
@@ -6,17 +6,17 @@ PORTVERSION=	4.0
 PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
-DISTNAME=	c2ps-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A PostScript pretty-printer for C source
 
 LIB_DEPENDS=	paper:${PORTSDIR}/print/libpaper
 
-MAKE_ENV=	CCFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-MAN1=		c2ps.1
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_FILES=	bin/c2ps
 
+MAN1=		c2ps.1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/c2ps ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/c2ps.1 ${MANPREFIX}/man/man1

Modified: head/print/c2ps/files/patch-Makefile
==============================================================================
--- head/print/c2ps/files/patch-Makefile	Fri May  3 18:57:53 2013	(r317231)
+++ head/print/c2ps/files/patch-Makefile	Fri May  3 19:05:17 2013	(r317232)
@@ -1,23 +1,24 @@
 --- Makefile.orig	1997-05-16 00:50:56.000000000 +0900
-+++ Makefile	2013-05-02 15:48:59.000000000 +0900
-@@ -2,12 +2,12 @@
++++ Makefile	2013-05-04 04:02:28.000000000 +0900
+@@ -2,12 +2,13 @@
  # Last modified: Sat Apr 19 1997
  
  RM	= 	rm -f
 -CC	=	gcc
 -CCFLAGS =       -O
 +CC?	=	gcc
-+CCFLAGS?=       -O
++CCFLAGS?=       ${CFLAGS}
  
 -PREFIX	=	/usr/local
 +PREFIX?=	/usr/local
  BIN	=	$(PREFIX)/bin
 -MAN	=	$(PREFIX)/man/man1
++MAN1PREFIX?=	${PREFIX}
 +MAN	=	${MAN1PREFIX}/man/man1
  
  # you may predefine some of the default settings
  DEFAULT_FONT	= \"Courier\"
-@@ -31,23 +31,20 @@
+@@ -31,21 +32,20 @@
   -DSTRINGS=$(STRINGS_FONT) -DPREPROC=$(PREPROC_FONT)\
   -DKEYWORD=$(KEYWORD_FONT) -DTYPE=$(TYPE_FONT)\
   -DLNUMBER=$(LNUMBER_FONT) -DFUNCTION=$(FUNCTION_FONT)\
@@ -39,9 +40,7 @@
  
  compile:	c2ps.c
 -	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c
-+	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c -L${LOCALBASE}/lib -lm -lpaper
++	$(CC) $(PREP_OPTIONS) $(CCFLAGS) $(CPPFLAGS) -o c2ps c2ps.c -L${LOCALBASE}/lib -lm -lpaper
  
  clean:
  	$(RM) c2ps *.o core *~
--
--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305031905.r43J5HNK093550>