OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jun-2005 17:54:53
Branch: HEAD Handle: 2005060316545300
Added files:
openpkg-src/radius radius.patch
Modified files:
openpkg-src/radius radius.spec
Log:
remove old Solaris 2.6 hack; fix gettext related build problems
Summary:
Revision Changes Path
1.3 +49 -0 openpkg-src/radius/radius.patch
1.45 +7 -10 openpkg-src/radius/radius.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/radius/radius.patch
============================================================================
$ cvs diff -u -r0 -r1.3 radius.patch
--- /dev/null 2005-06-03 17:54:49 +0200
+++ radius.patch 2005-06-03 17:54:53 +0200
@@ -0,0 +1,49 @@
+Index: lib/argp-help.c
+--- lib/argp-help.c.orig 2003-08-15 15:31:00.000000000 +0200
++++ lib/argp-help.c 2005-06-03 16:35:10.975522742 +0200
+@@ -56,18 +56,7 @@
+ # include <strings.h>
+ #endif
+
+-#ifndef _
+-/* This is for other GNU distributions with internationalized messages. */
+-# if defined HAVE_LIBINTL_H || defined _LIBC
+-# include <libintl.h>
+-# ifdef _LIBC
+-# undef dgettext
+-# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
+-# endif
+-# else
+ # define dgettext(domain, msgid) (msgid)
+-# endif
+-#endif
+
+ #include "argp.h"
+ #include "argp-fmtstream.h"
+Index: lib/argp-parse.c
+--- lib/argp-parse.c.orig 2002-05-16 18:24:38.000000000 +0200
++++ lib/argp-parse.c 2005-06-03 16:35:33.778383554 +0200
+@@ -36,23 +36,9 @@
+ # include <alloca.h>
+ #endif
+
+-#ifndef _
+-/* This is for other GNU distributions with internationalized messages.
+- When compiling libc, the _ macro is predefined. */
+-# if defined HAVE_LIBINTL_H || defined _LIBC
+-# include <libintl.h>
+-# ifdef _LIBC
+-# undef dgettext
+-# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
+-# endif
+-# else
+ # define dgettext(domain, msgid) (msgid)
+ # define gettext(msgid) (msgid)
+-# endif
+-#endif
+-#ifndef N_
+ # define N_(msgid) msgid
+-#endif
+
+ #if _LIBC - 0
+ #include <bits/libc-lock.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/radius/radius.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 radius.spec
--- openpkg-src/radius/radius.spec 24 Mar 2005 11:20:09 -0000 1.44
+++ openpkg-src/radius/radius.spec 3 Jun 2005 15:54:53 -0000 1.45
@@ -33,16 +33,17 @@
Group: Network
License: GPL
Version: 1.3
-Release: 20041123
+Release: 20050603
# list of sources
Source0: ftp://ftp.gnu.org/gnu/radius/radius-%{version}.tar.gz
Source1: rc.radius
+Patch0: radius.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, flex, bison, m4, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, flex, bison, m4, gcc,
libtool
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: readline
PreReq: readline
@@ -65,16 +66,11 @@
%prep
%setup -q
- case "%{l_platform -t}" in
- *-sunos5.6 )
- %{l_shtool} subst \
- -e 's;socklen_t;int;g' \
- radiusd/radiusd.c
- ;;
- esac
+ %patch -p0
%build
CC="%{l_cc}" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags}" \
./configure \
--prefix=%{l_prefix} \
@@ -89,7 +85,8 @@
--without-server-guile \
--enable-snmp \
--disable-pam \
- --disable-nls
+ --disable-nls \
+ --disable-shared
%{l_shtool} subst \
-e "s;/var/log;%{l_prefix}/var/radius/log;g" \
-e "s;/var/run;%{l_prefix}/var/radius/run;g" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
