From owner-svn-ports-head@FreeBSD.ORG Fri May 3 19:05:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 18920CDD; Fri, 3 May 2013 19:05:18 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E46C21E6B; Fri, 3 May 2013 19:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r43J5HEA093552; Fri, 3 May 2013 19:05:17 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r43J5HNK093550; Fri, 3 May 2013 19:05:17 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201305031905.r43J5HNK093550@svn.freebsd.org> From: Hiroki Sato Date: Fri, 3 May 2013 19:05:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317232 - in head/print/c2ps: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 May 2013 19:05:18 -0000 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 *~ -- --