cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- honor CFLAGS.

Browse Source 
- format SHARED_LIB lines.

ok pvalchev@
This commit is contained in:
aanriot 2007-05-26 04:03:08 +00:00
parent 551ec9b592
commit 835e0f3543
3 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/pfe/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2006/12/30 16:24:05 aanriot Exp $
# $OpenBSD: Makefile,v 1.6 2007/05/26 04:03:08 aanriot Exp $
COMMENT= "Portable Forth Environment"
DISTNAME= pfe-0.32.94
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= pfe 32.94 \
pfe-0 32.94
PKGNAME= ${DISTNAME}p3
SHARED_LIBS += pfe 32.95 # .32.94
SHARED_LIBS += pfe-0 32.95
CATEGORIES= lang
HOMEPAGE= http://pfe.sourceforge.net/
@ -21,7 +21,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfe/}
WANTLIB= c m ncurses
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --mandir=${PREFIX}/man
CONFIGURE_ARGS= --mandir=${PREFIX}/man
USE_LIBTOOL= Yes

26
lang/pfe/patches/patch-pfe_Makefile_in Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-pfe_Makefile_in,v 1.1 2007/05/26 04:03:08 aanriot Exp $
--- pfe/Makefile.in.orig Mon Mar 3 23:04:11 2003
+++ pfe/Makefile.in Fri May 25 19:45:59 2007
@@ -98,11 +98,11 @@ install_sh = @install_sh@
libpfe_LIBADD = @libpfe_LIBADD@
libpfe_VERSION = @libpfe_VERSION@
libpfe_la = @libpfe_la@
-DEBUG = @WITHOUT_OPT@ @DEBUG@
+DEBUG =
GCC_WARN = @GCC_WARN@
LIB_TERM = @LIB_TERM@
-OPTIM = @WITH_OPT@ @OPTIM@
+OPTIM =
PFE_DEFS = @PFE_DEFS@
USER_CONFIG = @USER_CONFIG@
WITH_CFLAGS = @WITH_CFLAGS@
@@ -184,7 +184,7 @@ pkginc_gen_headers = double-sub.h \
# note: on k12xx, we link dl-internal directly since we also link main-k12
# but the dl-internal knows only zchar-ext, the other modules are external.
-CCOPTS = @cc_opt_pipe@ @cc_opt_write_strings@ @cc_opt_strict_prototypes@
+CCOPTS = @cc_opt_write_strings@ @cc_opt_strict_prototypes@
INCLUDES = $(OPT_FLOAT) $(OPTIM) $(DEBUG) $(PFE_DEFS) \
$(CCOPTS) $(GCC_WARN) $(WITH_CFLAGS) $(USER_CONFIG)

43
lang/pfe/patches/patch-pfe_configure
View File

@ -1,7 +1,42 @@
$OpenBSD: patch-pfe_configure,v 1.1 2005/12/30 23:21:16 alek Exp $
--- pfe/configure.orig Mon Dec 26 14:30:13 2005
+++ pfe/configure Mon Dec 26 14:30:39 2005
@@ -11746,21 +11746,6 @@ echo "${ECHO_T}:can use --with-regs with
$OpenBSD: patch-pfe_configure,v 1.2 2007/05/26 04:03:08 aanriot Exp $
--- pfe/configure.orig Mon Mar 3 23:04:06 2003
+++ pfe/configure Fri May 25 23:05:36 2007
@@ -7358,7 +7358,7 @@ then
then
ac_compile_warnings_opt='-Wall'
fi
- CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
+ CXXFLAGS="$CXXFLAGS"
ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
fi
@@ -7368,7 +7368,7 @@ then
then
ac_compile_warnings_opt='-Wall'
fi
- CFLAGS="$CFLAGS $ac_compile_warnings_opt"
+ CFLAGS="$CFLAGS"
ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
fi
echo "$as_me:7374: result: $ac_compile_warnings_msg" >&5
@@ -11681,7 +11681,7 @@ EOF
rm -f conftest.*
fi
if test -n "$ac_cv_prog_cc_warnings"; then
- CFLAGS="$CFLAGS $ac_cv_prog_cc_warnings"
+ CFLAGS="$CFLAGS"
else
ac_cv_prog_cc_warnings="unknown"
fi
@@ -11693,7 +11693,6 @@ echo "${ECHO_T}$ac_cv_prog_cc_warnings" >&6
GCC_WARN="" ; OPTIM="" ; DEBUG=""
echo "$as_me:11694: checking optimize level \"$WITHVAL_OPT\" is..." >&5
echo $ECHO_N "checking optimize level \"$WITHVAL_OPT\" is...... $ECHO_C" >&6
-CFLAGS=`echo " $CFLAGS " | sed -e 's/ -O[0-9]* / /'`
opt_level="$WITHVAL_OPT"
if test "$GCC" = "yes" ; then
OPTIM="-O$opt_level"
@@ -11746,21 +11745,6 @@ echo "${ECHO_T}:can use --with-regs with traditional g
echo "${ECHO_T}:and use --with-regs on unknown gcc version" >&6 ;;
esac ;;
esac