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

better patches (mailed to author)

Browse Source
This commit is contained in:
jason 1999-12-31 22:59:20 +00:00
parent c8447ec600
commit ce2273402a
4 changed files with 109 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/flwm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 1999/12/08 19:43:46 jason Exp $
# $OpenBSD: Makefile,v 1.2 1999/12/31 22:59:20 jason Exp $
DISTNAME= flwm-0.25
PKGNAME= flwm-0.25
@ -8,7 +8,8 @@ MAINTAINER= jason@OpenBSD.ORG
EXTRACT_SUFX= .tgz
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--includedir=/usr/local/include --libdir=/usr/local/lib
CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
NO_SHARED_LIBS= yes
LIB_DEPENDS= fltk:${PORTSDIR}/x11/fltk

20
x11/flwm/patches/patch-aa
View File

@ -1,20 +0,0 @@
--- makeinclude.in.orig Sun Sep 12 16:04:44 1999
+++ makeinclude.in Sun Sep 12 16:04:47 1999
@@ -15,12 +15,12 @@
MAKEDEPEND =@MAKEDEPEND@
# flags for C++ compiler:
-CFLAGS =@CFLAGS@
-CFLAGS_D =@CFLAGS_D@
-CXXFLAGS =@CXXFLAGS@
-CXXFLAGS_D =@CXXFLAGS_D@
+CFLAGS =-I$(includedir) @CFLAGS@
+CFLAGS_D =-I$(includedir) @CFLAGS_D@
+CXXFLAGS =-I$(includedir) @CXXFLAGS@
+CXXFLAGS_D =-I$(includedir) @CXXFLAGS_D@
# libraries to link with:
-LDLIBS =@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
+LDLIBS =-L$(libdir) @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
INSTALL =@INSTALL@

53
x11/flwm/patches/patch-configure Normal file
View File

@ -0,0 +1,53 @@
--- configure.orig Fri Dec 31 17:44:14 1999
+++ configure Fri Dec 31 17:46:45 1999
@@ -1805,10 +1805,10 @@
if test -n "$GXX"; then
# GNU C compiler
# -Wno-return-type is necessary for Xlib header files on many systems:
- CFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CXXFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then
if expr "`(uname -r)`" \>= 6.2; then
@@ -1819,23 +1819,23 @@
# but -M is broken so use old compiler:
MAKEDEPEND="CC -M"
# -woff 3322 is necessary due to errors in Xlib headers on IRIX
- CFLAGS="-fullwarn -O2 $X_CFLAGS"
- CFLAGS_D="-fullwarn -gslim -DDEBUG $X_CFLAGS"
- CXXFLAGS="-fullwarn -woff 3322 -O2 $X_CFLAGS"
- CXXFLAGS_D="-fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
else
# old Irix compiler:
- CFLAGS="-O2 $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="+w +pp -O2 $X_CFLAGS"
- CXXFLAGS_D="+w +pp -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
fi
else
# generic C compiler:
- CFLAGS="-O $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-O $X_CFLAGS"
- CXXFLAGS_D="-g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
fi
fi

53
x11/flwm/patches/patch-configure.in Normal file
View File

@ -0,0 +1,53 @@
--- configure.in.orig Fri Dec 31 17:42:58 1999
+++ configure.in Fri Dec 31 17:44:00 1999
@@ -18,10 +18,10 @@
if test -n "$GXX"; then
# GNU C compiler
# -Wno-return-type is necessary for Xlib header files on many systems:
- CFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CXXFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then
if expr "`(uname -r)`" \>= 6.2; then
@@ -32,23 +32,23 @@
# but -M is broken so use old compiler:
MAKEDEPEND="CC -M"
# -woff 3322 is necessary due to errors in Xlib headers on IRIX
- CFLAGS="-fullwarn -O2 $X_CFLAGS"
- CFLAGS_D="-fullwarn -gslim -DDEBUG $X_CFLAGS"
- CXXFLAGS="-fullwarn -woff 3322 -O2 $X_CFLAGS"
- CXXFLAGS_D="-fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
else
# old Irix compiler:
- CFLAGS="-O2 $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="+w +pp -O2 $X_CFLAGS"
- CXXFLAGS_D="+w +pp -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
fi
else
# generic C compiler:
- CFLAGS="-O $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-O $X_CFLAGS"
- CXXFLAGS_D="-g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
fi
fi
AC_SUBST(MAKEDEPEND)