OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2003 14:30:26
Branch: HEAD Handle: 2003072213302500
Added files:
openpkg-src/ircd ircd.patch
Modified files:
openpkg-src/ircd ircd.spec
Removed files:
openpkg-src/ircd ircd.freebsd.patch
Log:
speclint police: move ircd.patch into CVS and merge with
ircd.freebsd.patch files
Summary:
Revision Changes Path
1.2 +0 -11 openpkg-src/ircd/ircd.freebsd.patch
1.1 +28 -0 openpkg-src/ircd/ircd.patch
1.45 +2 -8 openpkg-src/ircd/ircd.spec
____________________________________________________________________________
rm -f openpkg-src/ircd/ircd.freebsd.patch <<'@@ .'
Index: openpkg-src/ircd/ircd.freebsd.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.patch
============================================================================
$ cvs diff -u -r0 -r1.1 ircd.patch
--- /dev/null 2003-07-22 14:30:26.000000000 +0200
+++ ircd.patch 2003-07-22 14:30:26.000000000 +0200
@@ -0,0 +1,28 @@
+--- common/os.h.orig Thu Feb 3 18:57:00 2000
++++ common/os.h Tue Oct 16 17:56:26 2001
+@@ -744,7 +744,7 @@
+ 0, 0, 0, 0, 0};
+ # endif
+
+-# define IRCDCONF_DELIMITER '%'
++# define IRCDCONF_DELIMITER ';'
+
+ #else
+ # define AFINET AF_INET
+@@ -757,5 +757,5 @@
+ # define IN_ADDR in_addr
+
+ # define WHOSTENTP(x) (x)
+-# define IRCDCONF_DELIMITER ':'
++# define IRCDCONF_DELIMITER ';'
+ #endif
+--- support/configure Tue Jan 14 12:20:16 2003
++++ support/configure Tue Jan 14 12:29:41 2003
+@@ -1308,7 +1308,6 @@
+
+ if echo "$irc_cv_solaris_2" | egrep "^2\.(0|1|2)" >/dev/null; then
+ cat >> confdefs.h <<\EOF
+-#define SOLARIS_2_0_2_1_2_2 1
+ EOF
+
+ elif echo "$irc_cv_solaris_2" | grep "^2\.3" >/dev/null; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 ircd.spec
--- openpkg-src/ircd/ircd.spec 22 Jul 2003 08:10:49 -0000 1.44
+++ openpkg-src/ircd/ircd.spec 22 Jul 2003 12:30:25 -0000 1.45
@@ -43,8 +43,7 @@
Source1: rc.ircd
Source2: ircd.conf
Source3: fsl.ircd
-Patch0: irc%{version}.patch
-Patch1: ircd.freebsd.patch
+Patch0: ircd.patch
# build information
Prefix: %{l_prefix}
@@ -69,12 +68,7 @@
%prep
%setup -q -n irc%{version}
- %patch0 -p0
- case "%{l_target}" in
- *-freebsd* )
- %patch1 -p1
- ;;
- esac
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
