OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 01-Dec-2002 20:51:41
Branch: HEAD Handle: 2002120119514001
Modified files:
openpkg-src/xv xv.patch xv.spec
openpkg-web news.txt
Log:
polish package
Summary:
Revision Changes Path
1.2 +11 -4 openpkg-src/xv/xv.patch
1.6 +31 -31 openpkg-src/xv/xv.spec
1.2163 +2 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/xv/xv.patch
============================================================
$ cvs diff -u -r1.1 -r1.2 xv.patch
--- openpkg-src/xv/xv.patch 9 Aug 2002 19:19:54 -0000 1.1
+++ openpkg-src/xv/xv.patch 1 Dec 2002 19:51:41 -0000 1.2
@@ -1,13 +1,20 @@
diff -Naur xv-3.10a.orig/xv.h xv-3.10a/xv.h
--- xv-3.10a.orig/xv.h Mon Jan 23 21:22:23 1995
+++ xv-3.10a/xv.h Fri Aug 9 21:05:23 2002
-@@ -116,7 +116,9 @@
+@@ -115,7 +115,7 @@
+ #ifndef VMS
# include <errno.h>
extern int errno; /* SHOULD be in errno.h, but often isn't */
- # ifndef __NetBSD__
-+# ifndef __FreeBSD__
+-# ifndef __NetBSD__
++# if !defined(__NetBSD__) && !defined(__FreeBSD__)
extern char *sys_errlist[]; /* this too... */
-+# endif
# endif
#endif
+@@ -159,6 +159,7 @@
+ !defined(bsd43) && \
+ !defined(aux) && \
+ !defined(__bsdi__) && \
++ !defined(__FreeBSD__) && \
+ !defined(sequent)
+ # if defined(hp300) || defined(hp800) || defined(NeXT)
Index: openpkg-src/xv/xv.spec
============================================================
$ cvs diff -u -r1.5 -r1.6 xv.spec
--- openpkg-src/xv/xv.spec 20 Sep 2002 16:06:02 -0000 1.5
+++ openpkg-src/xv/xv.spec 1 Dec 2002 19:51:41 -0000 1.6
@@ -33,7 +33,7 @@
Group: XWindow
License: XV
Version: 3.10a
-Release: 20020920
+Release: 20021201
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, patch
-PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, gzip
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, zlib, tiff
+PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, zlib, tiff, gzip
AutoReq: no
AutoReqProv: no
@@ -71,36 +71,35 @@
%patch1 -p0
%patch2 -p0
%patch3 -p1
- patch -p1 < xvpng.diff
+ %{l_patch} -p1 < xvpng.diff
# use our own gunzip command
- %{l_shtool} subst -e 's;#undef USE_GUNZIP;#define USE_GUNZIP;' \
- -e 's;# define GUNZIP "/usr/local/bin/gunzip -q";#define
GUNZIP "%{l_prefix}/bin/gunzip -q";' \
- config.h
-
- # use our own JPEG, PNG, and z libraries
- %{l_shtool} subst -e 's;\(\tcd $(JPEGDIR)\).*;;' \
- -e 's;\(\t( cd $(TIFFDIR) \;\).*;;' \
- -e 's;\(JPEGINC = -I\)$(JPEGDIR);\1%{l_prefix}/include;' \
- -e 's;\(JPEGLIB =
\)$(JPEGDIR)\(/libjpeg.a\);\1%{l_prefix}/lib\2;' \
- -e 's;\(PNGINC = -I\)$(PNGDIR);\1%{l_prefix}/include;' \
- -e 's;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
- -e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\1%{l_prefix}/include;' \
- -e 's;\(ZLIBLIB = -L\)$(ZLIBDIR)\(.*\);\1%{l_prefix}/lib\2;' \
- -e 's;\(TIFFINC = -I\)$(TIFFDIR);\1%{l_prefix}/include/tiff;'
\
- -e 's;\(TIFFLIB =
\)$(TIFFDIR)\(/libtiff.a\);\1%{l_prefix}/lib\2;' \
- Makefile
+ %{l_shtool} subst \
+ -e 's;#undef USE_GUNZIP;#define USE_GUNZIP;' \
+ -e 's;# define GUNZIP "/usr/local/bin/gunzip -q";#define GUNZIP
"%{l_prefix}/bin/gunzip -q";' \
+ config.h
+
+ # use our own JPEG, TIFF and PNG libraries
+ %{l_shtool} subst \
+ -e 's;\(\tcd $(JPEGDIR)\).*;;' \
+ -e 's;\(\t( cd $(TIFFDIR) \;\).*;;' \
+ -e 's;\(JPEGINC = -I\)$(JPEGDIR);\1%{l_prefix}/include;' \
+ -e 's;\(JPEGLIB = \)$(JPEGDIR)\(/libjpeg.a\);\1%{l_prefix}/lib\2;' \
+ -e 's;\(PNGINC = -I\)$(PNGDIR);\1%{l_prefix}/include;' \
+ -e 's;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
+ -e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\1%{l_prefix}/include;' \
+ -e 's;\(ZLIBLIB = -L\)$(ZLIBDIR)\(.*\);\1%{l_prefix}/lib\2;' \
+ -e 's;\(TIFFINC = -I\)$(TIFFDIR);\1%{l_prefix}/include/tiff;' \
+ -e 's;\(TIFFLIB = \)$(TIFFDIR)\(/libtiff.a\);\1%{l_prefix}/lib\2;' \
+ Makefile
%build
- # fix braindead FreeBSD
- CCHACK="-O"
- case "%{l_target}" in
- *-freebsd*)CCHACK="-O -I`%{l_prefix}/etc/rc --query x11_incdir`
-L`%{l_prefix}/etc/rc --query x11_libdir`";;
- esac
-
- # build XV
+ # build package
+ CCOPTS="-O"
+ CCOPTS="$CCOPTS -I`%{l_prefix}/etc/rc --query x11_incdir`"
+ CCOPTS="$CCOPTS -L`%{l_prefix}/etc/rc --query x11_libdir`"
JPEGLIB=%{l_prefix}/lib/libjpeg.a
- %{l_make} %{l_mflags} CCOPTS="$CCHACK"
+ %{l_make} %{l_mflags} CCOPTS="$CCOPTS"
%install
rm -rf $RPM_BUILD_ROOT
@@ -109,18 +108,19 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/share \
- $RPM_BUILD_ROOT%{l_prefix}/share/%name \
+ $RPM_BUILD_ROOT%{l_prefix}/share/%{name} \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
- # install XV
+ # install package
%{l_make} %{l_mflags} install \
BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
- LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/%name \
+ LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/%{name} \
MANSUF=1 MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1
# strip binaries
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2162 -r1.2163 news.txt
--- openpkg-web/news.txt 1 Dec 2002 19:32:31 -0000 1.2162
+++ openpkg-web/news.txt 1 Dec 2002 19:51:40 -0000 1.2163
@@ -1,3 +1,5 @@
+01-Dec-2002: Upgraded package: P<xv-3.10a-20021201>
+01-Dec-2002: Upgraded package: P<mozilla-1.2-20021201>
01-Dec-2002: Upgraded package: P<imagemagick-5.5.2.0-20021201>
01-Dec-2002: Upgraded package: P<lame-3.93.1-20021201>
01-Dec-2002: Upgraded package: P<gmp-4.1.1-20021201>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
