summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick S. Gardella <patrick@FreeBSD.org>2000-09-20 14:22:15 +0000
committerPatrick S. Gardella <patrick@FreeBSD.org>2000-09-20 14:22:15 +0000
commite577a51be548ebfbc3ed01903c39c5605cc814c5 (patch)
treefbec69084a5c303b6d541fa0dd1bf41d0c3c4316
parentStyle and mdoc fixes. (diff)
Update port to flwm 1.0
Reviewed by: dima Approved by: dima
Notes
Notes: svn path=/head/; revision=32896
-rw-r--r--x11-wm/flwm/Makefile2
-rw-r--r--x11-wm/flwm/distinfo2
-rw-r--r--x11-wm/flwm/files/patch-aa4
-rw-r--r--x11-wm/flwm/files/patch-ab28
4 files changed, 24 insertions, 12 deletions
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index a3fc5dcef87c..1b64cb405972 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= flwm
-PORTVERSION= 0.25
+PORTVERSION= 1.00
CATEGORIES= x11-wm
MASTER_SITES= http://flwm.sourceforge.net/ \
http://www.cinenet.net/users/spitzak/flwm/ \
diff --git a/x11-wm/flwm/distinfo b/x11-wm/flwm/distinfo
index 2abac7b47404..dbc8259cbc04 100644
--- a/x11-wm/flwm/distinfo
+++ b/x11-wm/flwm/distinfo
@@ -1 +1 @@
-MD5 (flwm-0.25.tgz) = be036c20b15a28eed2b688cd7ef3f202
+MD5 (flwm-1.00.tgz) = d8479411edfa791408c69255417db26c
diff --git a/x11-wm/flwm/files/patch-aa b/x11-wm/flwm/files/patch-aa
index de2fb4c18e02..60ae1edf630e 100644
--- a/x11-wm/flwm/files/patch-aa
+++ b/x11-wm/flwm/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Wed Apr 14 18:50:44 1999
-+++ Makefile Wed Apr 14 18:50:51 1999
+--- Makefile.orig Tue Sep 19 20:49:19 2000
++++ Makefile Tue Sep 19 20:50:18 2000
@@ -5,7 +5,7 @@
CXXFILES = main.C Frame.C Rotated.C Menu.C FrameWindow.C Desktop.C Hotkeys.C
diff --git a/x11-wm/flwm/files/patch-ab b/x11-wm/flwm/files/patch-ab
index c37220f87a24..78a7d4e4cd2e 100644
--- a/x11-wm/flwm/files/patch-ab
+++ b/x11-wm/flwm/files/patch-ab
@@ -1,5 +1,17 @@
---- configure.orig Wed Apr 14 18:54:10 1999
-+++ configure Wed Apr 14 18:56:19 1999
+--- configure.orig Wed Jan 5 05:14:02 2000
++++ configure Tue Sep 19 20:43:39 2000
+@@ -681,9 +681,9 @@
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+- CFLAGS="-g -O2"
++ CFLAGS="$CXXFLAGS"
+ else
+- CFLAGS="-O2"
++ CFLAGS="$CXXFLAGS"
+ fi
+ else
+ GCC=
@@ -813,9 +813,9 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
@@ -16,11 +28,11 @@
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="-Wall -Wno-return-type $CFLAGS $X_CFLAGS"
- CFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
-- CXXFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
-+ CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
- CXXFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+- CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
++ CFLAGS="$CFLAGS -Wall -Wno-return-type $CFLAGS $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
++ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then