Date: Mon, 13 Jan 2014 03:19:07 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185693: devel/cvstrack: Support CC properly Message-ID: <20140113031907.b1fb31d4bc2fe79a80419710@yahoo.com> Resent-Message-ID: <201401121840.s0CIe141049278@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185693
>Category: ports
>Synopsis: devel/cvstrack: Support CC properly
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 18:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CC properly
Remove file:
files/patch-Makefile
files/patch-main.mk
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/cvstrac/Makefile devel/cvstrac/Makefile
--- /usr/ports/devel/cvstrac/Makefile 2013-12-17 07:57:07.000000000 +0900
+++ devel/cvstrac/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -10,19 +10,24 @@
MAINTAINER= ports@FreeBSD.org
COMMENT?= Web-Based Bug And Patch-Set Tracking System For CVS
-WRKSRC= ${WRKDIR}/cvstrac-${PORTVERSION}
-USE_SQLITE= yes
-USES= gmake pkgconfig
+LICENSE= GPLv2
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
-MAKE_ARGS+= SRCDIR=${WRKSRC} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+USES= gmake pkgconfig
+USE_SQLITE= yes
+MAKEFILE= bsd-gcc.mk
+MAKE_ARGS+= BCC="${CC} ${CPPFLAGS}" TCC="${CC} ${CPPFLAGS}" \
+ LIBSQLITE="${LDFLAGS}"
MAKE_JOBS_UNSAFE= yes
-NOMAN=
+CPPFLAGS+= $$(pkg-config --cflags sqlite3)
+LDFLAGS+= $$(pkg-config --libs sqlite3) -lcrypt -lm
+
PLIST_FILES= bin/${PORTNAME}
-NO_STAGE= yes
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- @${CAT} ${PKGMESSAGE}
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+ ${STAGEDIR}${PREFIX}/bin)
.include <bsd.port.mk>
diff -urN /usr/ports/devel/cvstrac/files/patch-Makefile devel/cvstrac/files/patch-Makefile
--- /usr/ports/devel/cvstrac/files/patch-Makefile 2013-11-06 21:50:38.000000000 +0900
+++ devel/cvstrac/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,37 +0,0 @@
---- ./Makefile.orig 2009-11-09 17:15:57.000000000 -0500
-+++ ./Makefile 2009-11-09 17:15:57.000000000 -0500
-@@ -0,0 +1,34 @@
-+#!/usr/bin/make
-+#
-+#### The toplevel directory of the source tree.
-+#
-+#SRCDIR = /home/drh/cvstrac/cvstrac
-+
-+#### C Compiler and options for use in building executables that
-+# will run on the platform that is doing the build.
-+#
-+BCC = gcc -g -O2 -I$(LOCALBASE)/include
-+
-+#### The suffix to add to executable files. ".exe" for windows.
-+# Nothing for unix.
-+#
-+E =
-+
-+#### C Compile and options for use in building executables that
-+# will run on the target platform. This is usually the same
-+# as BCC, unless you are cross-compiling.
-+#
-+TCC = gcc -g -O0 -Wall -I$(LOCALBASE)/include
-+
-+#### Extra arguments for linking against SQLite
-+#
-+LIBSQLITE = -L$(LOCALBASE)/lib `pkg-config --static --libs sqlite3` -lcrypt
-+
-+#### Installation directory
-+#
-+INSTALLDIR = $(PREFIX)/bin
-+
-+
-+# You should not need to change anything below this line
-+###############################################################################
-+include $(SRCDIR)/main.mk
diff -urN /usr/ports/devel/cvstrac/files/patch-main.mk devel/cvstrac/files/patch-main.mk
--- /usr/ports/devel/cvstrac/files/patch-main.mk 2013-11-06 21:50:38.000000000 +0900
+++ devel/cvstrac/files/patch-main.mk 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./main.mk.orig 2009-11-09 17:16:12.000000000 -0500
-+++ ./main.mk 2009-11-09 17:16:19.000000000 -0500
-@@ -115,7 +115,7 @@
- $(BCC) -o maketestdb $(SRCDIR)/maketestdb.c $(LIBSQLITE)
-
- $(APPNAME): headers $(OBJ)
-- $(TCC) -o $(APPNAME) $(OBJ) $(LIBSQLITE)
-+ $(TCC) -o $(APPNAME) $(OBJ) $(LIBSQLITE) -lm
-
- index.html: $(SRCDIR)/webpage.html $(SRCDIR)/VERSION
- sed -f $(SRCDIR)/VERSION $(SRCDIR)/webpage.html >index.html
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113031907.b1fb31d4bc2fe79a80419710>