From 27509e69fb8dd63a586ce57962e78b3d6bfd047b Mon Sep 17 00:00:00 2001
From: edwin <edwin@FreeBSD.org>
Date: Sat, 12 Apr 2003 00:42:11 +0000
Subject: Made configure-patch only for -current systems. Noticed by: bento

---
 devel/ccmalloc/Makefile               |  7 ++-
 devel/ccmalloc/files/patch-configure  | 82 -----------------------------------
 devel/ccmalloc/files/patch5-configure | 82 +++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 83 deletions(-)
 delete mode 100644 devel/ccmalloc/files/patch-configure
 create mode 100644 devel/ccmalloc/files/patch5-configure

(limited to 'devel')

diff --git a/devel/ccmalloc/Makefile b/devel/ccmalloc/Makefile
index 7676947a16bb..85d27234effe 100644
--- a/devel/ccmalloc/Makefile
+++ b/devel/ccmalloc/Makefile
@@ -23,7 +23,12 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 CC=		gcc -g -Wall
 CXX=		g++
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} > 500000
+PATCH_FILES+=	${FILESDIR}/patch5-configure
+.endif
+
 post-install:
 	@${CAT} pkg-message
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ccmalloc/files/patch-configure b/devel/ccmalloc/files/patch-configure
deleted file mode 100644
index 39b2b424f43b..000000000000
--- a/devel/ccmalloc/files/patch-configure
+++ /dev/null
@@ -1,82 +0,0 @@
---- configure.orig	Wed Feb  6 01:20:53 2002
-+++ configure	Sat Apr  5 04:43:02 2003
-@@ -27,7 +27,8 @@
- fmt="%-26s ..."
- debug=no
- prefix=/usr/local
--os=unsupported
-+
-+OPSYS=unsupported
- 
- #--------------------------------------------------------------------------#
- # process command line options
-@@ -40,7 +41,7 @@
-       exit 0
-       ;;
-     --prefix=*)
--      prefix=`expr $1 : '--prefix=\(.*\)'`
-+      prefix=`expr -- $1 : '--prefix=\(.*\)'`
-       ;;
-     --debug)
-       debug=yes
-@@ -70,26 +71,26 @@
-   SunOS )
-     case `uname -r` in
-       5.* )
--        os=solaris
-+        OPSYS=solaris
-         ;;
-     esac
-     ;;
-   Linux )
--    os=linux
-+    OPSYS=linux
-     ;;
-   FreeBSD )
--    os=freebsd
-+    OPSYS=freebsd
-     ;;
- esac
- 
--if [ $os = unsupported ]
-+if [ $OPSYS = unsupported ]
- then
-   echo 
-   echo "*** configure: unsupported operating system" 1>&2
-   exit 1
- fi
- 
--echo " $os"
-+echo " $OPSYS"
- 
- #--------------------------------------------------------------------------#
- # search for C compilers
-@@ -205,7 +206,7 @@
- }
- EOF
- 
--case $os in
-+case $OPSYS in
-   freebsd )
-     LIB=""
-     ;;
-@@ -285,8 +286,9 @@
- (
- echo "#ifndef _config_h_INCLUDED"
- [ $debug = no ] && echo "#define NDEBUG"
--[ $os = solaris ] && echo "#define OS_IS_SOLARIS"
--[ $os = linux ] && echo "#define OS_IS_LINUX"
-+[ $OPSYS = solaris ] && echo "#define OS_IS_SOLARIS"
-+[ $OPSYS = linux ] && echo "#define OS_IS_LINUX"
-+[ $OPSYS = freebsd ] && echo "#define OS_IS_FREEBSD"
- [ $atexit = yes ] && echo "#define HAVE_ATEXIT"
- cat<<-EOF
- #define VERSION "$version"
-@@ -319,6 +321,7 @@
- -e "s,@COMPILERS@,$COMPILERS,g" \
- -e "s,@VERSION@,$version,g" \
- -e "s,@TARGETS@,$TARGETS,g" \
-+-e "s,@OPSYS@,$OPSYS,g" \
- Makefile.in > $dst
- 
- echo >> $dst
diff --git a/devel/ccmalloc/files/patch5-configure b/devel/ccmalloc/files/patch5-configure
new file mode 100644
index 000000000000..39b2b424f43b
--- /dev/null
+++ b/devel/ccmalloc/files/patch5-configure
@@ -0,0 +1,82 @@
+--- configure.orig	Wed Feb  6 01:20:53 2002
++++ configure	Sat Apr  5 04:43:02 2003
+@@ -27,7 +27,8 @@
+ fmt="%-26s ..."
+ debug=no
+ prefix=/usr/local
+-os=unsupported
++
++OPSYS=unsupported
+ 
+ #--------------------------------------------------------------------------#
+ # process command line options
+@@ -40,7 +41,7 @@
+       exit 0
+       ;;
+     --prefix=*)
+-      prefix=`expr $1 : '--prefix=\(.*\)'`
++      prefix=`expr -- $1 : '--prefix=\(.*\)'`
+       ;;
+     --debug)
+       debug=yes
+@@ -70,26 +71,26 @@
+   SunOS )
+     case `uname -r` in
+       5.* )
+-        os=solaris
++        OPSYS=solaris
+         ;;
+     esac
+     ;;
+   Linux )
+-    os=linux
++    OPSYS=linux
+     ;;
+   FreeBSD )
+-    os=freebsd
++    OPSYS=freebsd
+     ;;
+ esac
+ 
+-if [ $os = unsupported ]
++if [ $OPSYS = unsupported ]
+ then
+   echo 
+   echo "*** configure: unsupported operating system" 1>&2
+   exit 1
+ fi
+ 
+-echo " $os"
++echo " $OPSYS"
+ 
+ #--------------------------------------------------------------------------#
+ # search for C compilers
+@@ -205,7 +206,7 @@
+ }
+ EOF
+ 
+-case $os in
++case $OPSYS in
+   freebsd )
+     LIB=""
+     ;;
+@@ -285,8 +286,9 @@
+ (
+ echo "#ifndef _config_h_INCLUDED"
+ [ $debug = no ] && echo "#define NDEBUG"
+-[ $os = solaris ] && echo "#define OS_IS_SOLARIS"
+-[ $os = linux ] && echo "#define OS_IS_LINUX"
++[ $OPSYS = solaris ] && echo "#define OS_IS_SOLARIS"
++[ $OPSYS = linux ] && echo "#define OS_IS_LINUX"
++[ $OPSYS = freebsd ] && echo "#define OS_IS_FREEBSD"
+ [ $atexit = yes ] && echo "#define HAVE_ATEXIT"
+ cat<<-EOF
+ #define VERSION "$version"
+@@ -319,6 +321,7 @@
+ -e "s,@COMPILERS@,$COMPILERS,g" \
+ -e "s,@VERSION@,$version,g" \
+ -e "s,@TARGETS@,$TARGETS,g" \
++-e "s,@OPSYS@,$OPSYS,g" \
+ Makefile.in > $dst
+ 
+ echo >> $dst
-- 
cgit