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 openpkg-web Date: 09-Jul-2003 10:23:42
Branch: HEAD Handle: 2003070909233705
Modified files:
openpkg-src/gd gd.spec
openpkg-src/perl-gd perl-gd.spec
openpkg-src/perl-tk perl-tk.spec
openpkg-src/postfix postfix.spec
openpkg-src/scanssh scanssh.spec
openpkg-src/sendmail sendmail.spec
openpkg-src/subversion subversion.spec
openpkg-src/transfig transfig.spec
openpkg-src/xfig xfig.spec
openpkg-web news.txt
Log:
switch to the syntax for %{l_cppflags} amd %{l_ldflags}
Summary:
Revision Changes Path
1.53 +4 -4 openpkg-src/gd/gd.spec
1.55 +3 -3 openpkg-src/perl-gd/perl-gd.spec
1.23 +4 -4 openpkg-src/perl-tk/perl-tk.spec
1.149 +6 -6 openpkg-src/postfix/postfix.spec
1.23 +4 -4 openpkg-src/scanssh/scanssh.spec
1.82 +6 -6 openpkg-src/sendmail/sendmail.spec
1.20 +4 -4 openpkg-src/subversion/subversion.spec
1.8 +6 -6 openpkg-src/transfig/transfig.spec
1.14 +6 -6 openpkg-src/xfig/xfig.spec
1.5460 +8 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 gd.spec
--- openpkg-src/gd/gd.spec 8 Jul 2003 14:39:39 -0000 1.52
+++ openpkg-src/gd/gd.spec 9 Jul 2003 08:23:38 -0000 1.53
@@ -33,7 +33,7 @@
Group: Graphics
License: GPL
Version: 2.0.15
-Release: 20030708
+Release: 20030709
# list of sources
Source0: http://www.boutell.com/gd/http/gd-%{version}.tar.gz
@@ -41,8 +41,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, png, zlib, jpeg, freetype
-PreReq: OpenPKG, openpkg >= 20030708, png, zlib, jpeg, freetype
+BuildPreReq: OpenPKG, openpkg >= 20030709, png, zlib, jpeg, freetype
+PreReq: OpenPKG, openpkg >= 20030709, png, zlib, jpeg, freetype
AutoReq: no
AutoReqProv: no
@@ -63,7 +63,7 @@
) >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags +libpng -freetype2}" \
+ CPPFLAGS="%{l_cppflags freetype2 . libpng}" \
LDFLAGS="%{l_ldflags}" \
LIBS="-lm" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-gd/perl-gd.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 perl-gd.spec
--- openpkg-src/perl-gd/perl-gd.spec 9 Jul 2003 07:03:24 -0000 1.54
+++ openpkg-src/perl-gd/perl-gd.spec 9 Jul 2003 08:23:38 -0000 1.55
@@ -62,8 +62,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, perl, perl-openpkg, gd >= 2.0.7
-PreReq: OpenPKG, openpkg >= 20030708, perl, perl-openpkg, gd >= 2.0.7
+BuildPreReq: OpenPKG, openpkg >= 20030709, perl, perl-openpkg, gd >= 2.0.7
+PreReq: OpenPKG, openpkg >= 20030709, perl, perl-openpkg, gd >= 2.0.7
AutoReq: no
AutoReqProv: no
@@ -103,7 +103,7 @@
# build and install GD glue module
( cd GD-%{V_gd}
(echo "y"; echo "y") |\
- GD_INC="%{l_cppflags . -freetype2}" \
+ GD_INC="%{l_cppflags freetype2 .}" \
GD_LIBS="%{l_ldflags} -lfreetype" \
%{l_prefix}/bin/perl-openpkg install
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-tk/perl-tk.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 perl-tk.spec
--- openpkg-src/perl-tk/perl-tk.spec 8 Jul 2003 14:41:47 -0000 1.22
+++ openpkg-src/perl-tk/perl-tk.spec 9 Jul 2003 08:23:39 -0000 1.23
@@ -65,7 +65,7 @@
Group: Language
License: GPL/Artistic
Version: 20030609
-Release: 20030708
+Release: 20030709
# list of sources
Source0: http://www.cpan.org/modules/by-module/Tk/Tk-%{V_tk}.tar.gz
@@ -102,8 +102,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, perl, perl-openpkg, X11, tiff, jpeg,
png, zlib
-PreReq: OpenPKG, openpkg >= 20030708, perl, perl-openpkg, X11, tiff, jpeg,
png, zlib
+BuildPreReq: OpenPKG, openpkg >= 20030709, perl, perl-openpkg, X11, tiff, jpeg,
png, zlib
+PreReq: OpenPKG, openpkg >= 20030709, perl, perl-openpkg, X11, tiff, jpeg,
png, zlib
AutoReq: no
AutoReqProv: no
@@ -188,7 +188,7 @@
# build Tk::TIFF
( cd Tk-TIFF-%{V_tk_tiff}
%{l_shtool} subst \
- -e 's;-I/usr/local/include;%{l_cppflags . -tiff};' \
+ -e 's;-I/usr/local/include;%{l_cppflags tiff .};' \
-e 's;-L/usr/local/lib;%{l_ldflags};' \
Makefile.PL
%{l_prefix}/bin/perl-openpkg install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.148 -r1.149 postfix.spec
--- openpkg-src/postfix/postfix.spec 8 Jul 2003 15:42:45 -0000 1.148
+++ openpkg-src/postfix/postfix.spec 9 Jul 2003 08:23:39 -0000 1.149
@@ -39,7 +39,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20030708
+Release: 20030709
# package options
%option with_fsl yes
@@ -63,8 +63,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, perl
-PreReq: OpenPKG, openpkg >= 20030708, perl, procmail, perl-time
+BuildPreReq: OpenPKG, openpkg >= 20030709, perl
+PreReq: OpenPKG, openpkg >= 20030709, perl, procmail, perl-time
BuildPreReq: pcre, db
PreReq: pcre, db
%if "%{with_fsl}" == "yes"
@@ -161,11 +161,11 @@
CCARGS="$CCARGS -DHAS_PCRE"
AUXLIBS="$AUXLIBS -lpcre"
%if "%{with_mysql}" == "yes"
- CCARGS="$CCARGS -DHAS_MYSQL %{l_cppflags . -mysql}"
- AUXLIBS="$AUXLIBS %{l_ldflags . -mysql} -lmysqlclient -lz -lm"
+ CCARGS="$CCARGS -DHAS_MYSQL %{l_cppflags mysql .}"
+ AUXLIBS="$AUXLIBS %{l_ldflags mysql .} -lmysqlclient -lz -lm"
%endif
%if "%{with_sasl}" == "yes"
- CCARGS="$CCARGS -DUSE_SASL_AUTH %{l_cppflags . -sasl}"
+ CCARGS="$CCARGS -DUSE_SASL_AUTH %{l_cppflags sasl .}"
AUXLIBS="$AUXLIBS -lsasl2 -lcrypt"
if [ -f /usr/lib/libdl.so -o -f /usr/lib/libdl.a ]; then
AUXLIBS="$AUXLIBS -ldl"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scanssh/scanssh.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 scanssh.spec
--- openpkg-src/scanssh/scanssh.spec 8 Jul 2003 14:42:21 -0000 1.22
+++ openpkg-src/scanssh/scanssh.spec 9 Jul 2003 08:23:40 -0000 1.23
@@ -33,7 +33,7 @@
Group: Security
License: BSD
Version: 1.6b
-Release: 20030708
+Release: 20030709
# list of sources
Source0: http://www.monkey.org/~provos/scanssh-%{version}.tar.gz
@@ -41,8 +41,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708
-PreReq: OpenPKG, openpkg >= 20030708
+BuildPreReq: OpenPKG, openpkg >= 20030709
+PreReq: OpenPKG, openpkg >= 20030709
BuildPreReq: openssl, libpcap
PreReq: openssl, libpcap
AutoReq: no
@@ -61,7 +61,7 @@
%build
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} %{l_cppflags . -openssl}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags openssl .}" \
LDFLAGS="%{l_ldflags}" \
LIBS="-lcrypto" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.81 -r1.82 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 8 Jul 2003 14:42:25 -0000 1.81
+++ openpkg-src/sendmail/sendmail.spec 9 Jul 2003 08:23:40 -0000 1.82
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 8.12.9
-Release: 20030708
+Release: 20030709
# package options
%option with_fsl yes
@@ -54,8 +54,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, m4, gcc, make
-PreReq: OpenPKG, openpkg >= 20030708, m4, make, perl, procmail
+BuildPreReq: OpenPKG, openpkg >= 20030709, m4, gcc, make
+PreReq: OpenPKG, openpkg >= 20030709, m4, make, perl, procmail
BuildPreReq: db >= 4.1.25
PreReq: db >= 4.1.25
%if "%{with_fsl}" == "yes"
@@ -176,7 +176,7 @@
%endif
%if "%{with_sasl}" == "yes"
echo "APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl"
- echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags . -sasl')dnl}"
+ echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags sasl .}')dnl"
echo "APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl"
%endif
%if "%{with_milter}" == "yes"
@@ -190,8 +190,8 @@
%endif
%if "%{with_mysql}" == "yes"
echo "APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl"
- echo "APPENDDEF(\`confINCDIRS',\`%{l_cppflags . -mysql')dnl}"
- echo "APPENDDEF(\`confLIBS',\`%{l_ldflags . -mysql} -lmysqlclient -lz
-lm')dnl"
+ echo "APPENDDEF(\`confINCDIRS',\`%{l_cppflags mysql .}')dnl"
+ echo "APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz
-lm')dnl"
%endif
) >devtools/Site/site.config.m4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 subversion.spec
--- openpkg-src/subversion/subversion.spec 8 Jul 2003 14:42:42 -0000 1.19
+++ openpkg-src/subversion/subversion.spec 9 Jul 2003 08:23:41 -0000 1.20
@@ -37,7 +37,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_release}
-Release: 20030708
+Release: 20030709
# list of sources
Source0:
http://subversion.tigris.org/files/documents/%{V_subdir}/subversion-%{V_release}.tar.gz
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, diffutils, make
-PreReq: OpenPKG, openpkg >= 20030708, diffutils
+BuildPreReq: OpenPKG, openpkg >= 20030709, diffutils, make
+PreReq: OpenPKG, openpkg >= 20030709, diffutils
BuildPreReq: libxml, db, openssl, zlib, apr
PreReq: libxml, db, openssl, zlib, apr
AutoReq: no
@@ -63,7 +63,7 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags . -libxml2}" \
+ CPPFLAGS="%{l_cppflags libxml2 .}" \
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/transfig/transfig.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 transfig.spec
--- openpkg-src/transfig/transfig.spec 8 Jul 2003 17:03:36 -0000 1.7
+++ openpkg-src/transfig/transfig.spec 9 Jul 2003 08:23:42 -0000 1.8
@@ -33,7 +33,7 @@
Group: XWindow
License: MIT-style
Version: 3.2.4
-Release: 20030708
+Release: 20030709
# list of sources
Source0: http://www.xfig.org/xfigdist/transfig.%{version}.tar.gz
@@ -42,9 +42,9 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, X11, gcc, make
+BuildPreReq: OpenPKG, openpkg >= 20030709, X11, gcc, make
BuildPreReq: zlib, jpeg, png, xpm
-PreReq: OpenPKG, openpkg >= 20030708, X11
+PreReq: OpenPKG, openpkg >= 20030709, X11
PreReq: zlib, jpeg, png, xpm
AutoReq: no
AutoReqProv: no
@@ -63,9 +63,9 @@
-e 's;^\(NEED_STRERROR.*\)$;XCOMM \1;' \
-e 's;^\(XFIGLIBDIR =\).*$;\1 %{l_prefix}/lib/X11/xfig;' \
-e 's;^\(PNGLIBDIR =\).*$;\1 %{l_prefix}/lib;' \
- -e 's;^\(PNGINC =\).*$;\1 %{l_cppflags . -libpng};' \
+ -e 's;^\(PNGINC =\).*$;\1 %{l_cppflags libpng .};' \
-e 's;^\(XPMLIBDIR =\).*$;\1 %{l_prefix}/lib;' \
- -e 's;^\(XPMINC =\).*$;\1 %{l_cppflags . -X11};' \
+ -e 's;^\(XPMINC =\).*$;\1 %{l_cppflags X11 .};' \
-e 's;^XCOMM \(DA4 =.*\)$;\1;' \
-e 's;^XCOMM \(#define USEXPM.*\)$;\1;' \
-e 's;^\(#define I18N\)$;XCOMM \1;' \
@@ -73,7 +73,7 @@
%{l_shtool} subst \
-e 's;#ifdef USE_PNG;#if 1;' \
-e 's;#ifdef USE_XPM;#if 1;' \
- -e 's;^\(INCLUDES = .*\);\1 %{l_cppflags . -libpng +X11};' \
+ -e 's;^\(INCLUDES = .*\);\1 %{l_cppflags libpng . X11};' \
fig2dev/dev/Imakefile
%{l_shtool} subst \
-e 's;^XCOMM \(USELATEX2E = .*\)$;\1;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xfig/xfig.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 xfig.spec
--- openpkg-src/xfig/xfig.spec 8 Jul 2003 14:43:21 -0000 1.13
+++ openpkg-src/xfig/xfig.spec 9 Jul 2003 08:23:42 -0000 1.14
@@ -33,7 +33,7 @@
Group: XWindow
License: MIT-style
Version: 3.2.4
-Release: 20030708
+Release: 20030709
# list of sources
Source0: http://www.xfig.org/xfigdist/xfig.%{version}.code_only.tar.gz
@@ -43,8 +43,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030708, X11, make, gcc
-PreReq: OpenPKG, openpkg >= 20030708, X11, transfig
+BuildPreReq: OpenPKG, openpkg >= 20030709, X11, make, gcc
+PreReq: OpenPKG, openpkg >= 20030709, X11, transfig
BuildPreReq: zlib, jpeg, png, xpm, xaw3d
PreReq: zlib, jpeg, png, xpm, xaw3d
AutoReq: no
@@ -70,15 +70,15 @@
-e 's;^XCOMM \(XAPPLOADDIR =\) .*$;\1 %{l_prefix}/etc/X11/app-defaults;' \
-e 's;^\(XFIGLIBDIR =\) .*$;\1 %{l_prefix}/lib/X11/xfig;' \
-e 's;^\(PNGLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
- -e 's;^\(PNGINC =\) .*$;\1 %{l_cppflags . -libpng};' \
+ -e 's;^\(PNGINC =\) .*$;\1 %{l_cppflags libpng .};' \
-e 's;^\(JPEGLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
-e 's;^\(JPEGINC =\) .*$;\1 %{l_cppflags};' \
-e 's;^XCOMM \(#define USEXPM\)$;\1;' \
-e 's;^XCOMM \(#define USEXPM_ICON\)$;\1;' \
-e 's;^\(XPMLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
- -e 's;^\(XPMINC =\) .*$;\1 %{l_cppflags . -X11};' \
+ -e 's;^\(XPMINC =\) .*$;\1 %{l_cppflags X11 .};' \
-e 's;^XCOMM \(#define XAW3D\)$;\1;' \
- -e 's;^\(XAW3DINC =\) .*$;\1 %{l_cppflags . -X11/Xaw3d};' \
+ -e 's;^\(XAW3DINC =\) .*$;\1 %{l_cppflags X11/Xaw3d .};' \
-e 's;^\(#define I18N\)$;XCOMM \1;' \
-e 's;^XCOMM \(USEINLINE = .*\)$;\1;' \
Imakefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5459 -r1.5460 news.txt
--- openpkg-web/news.txt 9 Jul 2003 08:22:40 -0000 1.5459
+++ openpkg-web/news.txt 9 Jul 2003 08:23:37 -0000 1.5460
@@ -1,3 +1,11 @@
+09-Jul-2003: Upgraded package: P<xfig-3.2.4-20030709>
+09-Jul-2003: Upgraded package: P<transfig-3.2.4-20030709>
+09-Jul-2003: Upgraded package: P<subversion-0.24.2-20030709>
+09-Jul-2003: Upgraded package: P<sendmail-8.12.9-20030709>
+09-Jul-2003: Upgraded package: P<scanssh-1.6b-20030709>
+09-Jul-2003: Upgraded package: P<postfix-2.0.13-20030709>
+09-Jul-2003: Upgraded package: P<perl-tk-20030609-20030709>
+09-Jul-2003: Upgraded package: P<gd-2.0.15-20030709>
09-Jul-2003: Upgraded package: P<openpkg-20030709-20030709>
09-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030709>
09-Jul-2003: Upgraded package: P<dmalloc-5.2.1-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
