Date: Wed, 6 Aug 2008 14:02:16 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/126302: [PATCH]math/calc: respect CC, CFLAGS, etc.; add tests; fix minor pkg-plist nits Message-ID: <200808061402.m76E2GqV047055@www.freebsd.org> Resent-Message-ID: <200808061410.m76EA2kg035268@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126302
>Category: ports
>Synopsis: [PATCH]math/calc: respect CC, CFLAGS, etc.; add tests; fix minor pkg-plist nits
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 06 14:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: bf
>Release: 7-STABLE i386
>Organization:
>Environment:
>Description:
The permissions on some installed files are still nonstandard, but that's for another time...
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN calc.orig/Makefile calc/Makefile
--- calc.orig/Makefile 2008-08-06 05:14:20.020381905 -0400
+++ calc/Makefile 2008-08-06 09:31:18.007274652 -0400
@@ -19,4 +19,12 @@
MAN1= calc.1
+CALCPAGER?= more
+MAKE_ENV+= CALCPAGER="${CALCPAGER}" CAT="${CAT}" CHMOD="${CHMOD}" CP="${CP}" \
+ GMAKE="${GMAKE}" LN="${LN}" MKDIR="${MKDIR}" MV="${MV}" RM="${RM}" \
+ SED="${SED}" TOUCH="${TOUCH}" TRUE="${TRUE}"
+
+regression-test: build
+ ( cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} check )
+
.include <bsd.port.mk>
diff -ruN calc.orig/files/patch-Makefile calc/files/patch-Makefile
--- calc.orig/files/patch-Makefile 2008-08-06 05:14:20.020381905 -0400
+++ calc/files/patch-Makefile 2008-08-06 09:31:18.007274652 -0400
@@ -1,5 +1,5 @@
---- Makefile.orig 2008-05-10 08:04:43.000000000 -0700
-+++ Makefile 2008-05-10 08:05:39.000000000 -0700
+--- Makefile.orig 2008-05-10 07:58:05.000000000 -0400
++++ Makefile 2008-08-06 08:53:08.992116860 -0400
@@ -585,7 +585,7 @@
#INCDIR= /usr/local/include
@@ -37,3 +37,103 @@
#MANDIR= /dev/env/DJDIR/man/man1
#MANDIR= /usr/man/u_man/man1
#MANDIR= /usr/contrib/man/man1
+@@ -857,7 +857,7 @@
+ #CALCPAGER= more
+ #CALCPAGER= pg
+ #CALCPAGER= cat
+-CALCPAGER= less
++#CALCPAGER= less
+ #CALCPAGER= less.exe -ci
+
+ # Debug/Optimize options for ${CC} and ${LCC}
+@@ -966,8 +966,8 @@
+ # MKDIR_ARG= -p # use mkdir -p when creating paths
+ # MKDIR_ARG= # use if system does not understand mkdir -p
+ #
+-MKDIR_ARG= -p
+-#MKDIR_ARG=
++#MKDIR_ARG= -p
++MKDIR_ARG=
+
+ # Some out of date operating systems require / want an executable to
+ # end with a certain file extension. Some compile systems such as
+@@ -999,35 +999,36 @@
+
+ # standard utilities used during make
+ #
+-SHELL= /bin/sh
++#SHELL= /bin/sh
+ LANG= C
+-MAKE= make
++#MAKE= make
+ AWK= awk
+-SED= sed
++#SED= sed
+ DIFF= diff
+ GREP= egrep
+ SORT= sort
+ TEE= tee
+ CTAGS= ctags
+-CHMOD= chmod
++#CHMOD= chmod
+ FMT= fmt
+ XARGS= xargs
+ CMP= cmp
+-MKDIR= mkdir
++#MKDIR= mkdir
+ SPLINT= splint
+ SPLINT_OPTS=
+-RM= rm
+-TOUCH= touch
++#RM= rm
++#TOUCH= touch
+ RMDIR= rmdir
+-CP= cp
+-MV= mv
++#CP= cp
++#MV= mv
+ CO= co
+ AR= ar
+-TRUE= true
+-CAT= cat
++#TRUE= true
++#CAT= cat
+ COL= col
+-LN= ln
+-LDCONFIG= ldconfig
++#LN= ln
++#LDCONFIG= ldconfig
++LDCONFIG=
+ # assume the X11 makedepend tool for the depend rule
+ MAKEDEPEND= makedepend
+ STRIP= strip
+@@ -1235,13 +1236,15 @@
+ #
+ CCWARN= -Wall -W -Wno-comment
+ CCWERR=
+-CCOPT= ${DEBUG}
++#CCOPT= ${DEBUG}
++CCOPT=
+ CCMISC=
+ #
+-LCC= gcc
+-CC= ${PURIFY} ${LCC} ${CCWERR}
++LCC= ${CC}
++#CC= ${PURIFY} ${LCC} ${CCWERR}
+ #
+-MAKE= gmake
++#MAKE= gmake
++MAKE= ${GMAKE}
+ #
+ endif
+
+@@ -1469,7 +1472,8 @@
+ else
+ ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ endif
+-CFLAGS= ${ICFLAGS} ${CCOPT}
++#CFLAGS= ${ICFLAGS} ${CCOPT}
++CFLAGS+= ${ICFLAGS} ${CCOPT}
+
+ # Required flags to link files for calc
+ #
diff -ruN calc.orig/pkg-plist calc/pkg-plist
--- calc.orig/pkg-plist 2008-08-06 05:14:20.040381374 -0400
+++ calc/pkg-plist 2008-08-06 09:31:18.007274652 -0400
@@ -483,12 +483,12 @@
%%DATADIR%%/unitfrac.cal
%%DATADIR%%/varargs.cal
%%DATADIR%%/xx_print.cal
-@dirrmtry share/man/man1
-@dirrmtry share/man
-@dirrmtry %%DATADIR%%/help
-@dirrmtry %%DATADIR%%/custom
-@dirrmtry %%DATADIR%%/custhelp
-@dirrmtry %%DATADIR%%
+@dirrmtry man/man1
+@dirrmtry man
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/custom
+@dirrm %%DATADIR%%/custhelp
+@dirrm %%DATADIR%%
@dirrmtry include/calc/custom
-@dirrmtry include/calc
-@dirrmtry bin/cscript
+@dirrm include/calc
+@dirrm bin/cscript
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808061402.m76E2GqV047055>