update to jumbo patches 20070520
This commit is contained in:
naddy
parent
a3b7c4a43a
commit
ddd5791df9
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.33 2007/04/06 22:21:30 espie Exp $
|
||||
# Original from: Marco S Hyman <marc@OpenBSD.ORG>
|
||||
# $OpenBSD: Makefile,v 1.34 2007/05/29 21:16:03 naddy Exp $
|
||||
|
||||
COMMENT= "X11 image display and modification tool"
|
||||
|
||||
DISTNAME= xv-3.10a
|
||||
PKGNAME= ${DISTNAME}p5
|
||||
PKGNAME= ${DISTNAME}p6
|
||||
CATEGORIES= graphics x11
|
||||
|
||||
MASTER_SITES= ftp://ftp.mirrorservice.org/sites/ftp.cis.upenn.edu/pub/xv/ \
|
||||
@ -12,38 +11,31 @@ MASTER_SITES= ftp://ftp.mirrorservice.org/sites/ftp.cis.upenn.edu/pub/xv/ \
|
||||
http://gd.tuwien.ac.at/graphics/xv/ \
|
||||
ftp://ftp.cis.upenn.edu/pub/xv/
|
||||
MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=png-mng/}
|
||||
DISTFILES= ${DISTNAME}.tar.gz xv-3.10a-jumbo-patches-20050501.tar.bz2:0
|
||||
DISTFILES= ${DISTNAME}.tar.gz xv-3.10a-jumbo-patches-20070520.tar.gz:0
|
||||
DIST_SUBDIR= xv
|
||||
|
||||
HOMEPAGE= http://www.trilon.com/xv/index.html
|
||||
|
||||
LIB_DEPENDS= jpeg.>=62.::graphics/jpeg \
|
||||
tiff.>=35.::graphics/tiff \
|
||||
png.>=2.::graphics/png
|
||||
|
||||
FAKE= lib
|
||||
|
||||
PERMIT_PACKAGE_CDROM= "Must buy license"
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= "Must buy license"
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= X11 c m z
|
||||
|
||||
USE_X11= Yes
|
||||
NO_REGRESS= Yes
|
||||
LIB_DEPENDS= jpeg.>=62.::graphics/jpeg \
|
||||
jasper.>=2.::graphics/jasper \
|
||||
tiff.>=38.::graphics/tiff \
|
||||
png.>=5.::graphics/png
|
||||
|
||||
MAKE_FLAGS+= USERCFLAGS="${CFLAGS}"
|
||||
WANTLIB= X11 Xau Xdmcp c m z
|
||||
|
||||
USE_X11= Yes
|
||||
MAKE_ENV= SYSCONFDIR="$(SYSCONFDIR)"
|
||||
FAKE_FLAGS=
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
pre-patch:
|
||||
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-patch-20050410.txt
|
||||
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-enh-patch-20050501.txt
|
||||
|
||||
post-install:
|
||||
@for f in bggen vdcomp xcmap xv xvpictoppm; do \
|
||||
strip ${PREFIX}/bin/$$f; \
|
||||
done
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xv
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
|
||||
${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
|
||||
@${PATCH} ${PATCH_DIST_ARGS} -p1 \
|
||||
< ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
MD5 (xv/xv-3.10a-jumbo-patches-20050501.tar.bz2) = FaP5CqzHtkJDnIW0XCHPWA==
|
||||
MD5 (xv/xv-3.10a-jumbo-patches-20070520.tar.gz) = n7LQ7DIEmBBcr+ujiliEcg==
|
||||
MD5 (xv/xv-3.10a.tar.gz) = LU++7BVhMENieBzI4vf3LQ==
|
||||
RMD160 (xv/xv-3.10a-jumbo-patches-20050501.tar.bz2) = 0Znn0bbFFi4MrQnUEYs3NfHRVu8=
|
||||
RMD160 (xv/xv-3.10a-jumbo-patches-20070520.tar.gz) = I7wHAwQW66ylzk0iOSHjMJTDe5M=
|
||||
RMD160 (xv/xv-3.10a.tar.gz) = fVReDA5bASCn0CbqVJy6GaU/vA0=
|
||||
SHA1 (xv/xv-3.10a-jumbo-patches-20050501.tar.bz2) = 3rQvwwaXMS8T/O24jxDMPtDO2Kw=
|
||||
SHA1 (xv/xv-3.10a-jumbo-patches-20070520.tar.gz) = 0AMIwWh9nYA9Ju9Axz0ZoPWTxiY=
|
||||
SHA1 (xv/xv-3.10a.tar.gz) = nmNy8VS+np41WXLL65HZjZw0JHQ=
|
||||
SHA256 (xv/xv-3.10a-jumbo-patches-20050501.tar.bz2) = 6fFTZKb/3gY3b/sZtWUtYEw2cTCLeviayG4JpRxNQz0=
|
||||
SHA256 (xv/xv-3.10a-jumbo-patches-20070520.tar.gz) = Ih7In98Hcr0JyEXLszeuz0EaGu4hUUC2dnF/SenmXIA=
|
||||
SHA256 (xv/xv-3.10a.tar.gz) = A+smsejzFcMJP0rnlIYrpGY30WwFXo775eO+tdQPxFE=
|
||||
SIZE (xv/xv-3.10a-jumbo-patches-20050501.tar.bz2) = 369886
|
||||
SIZE (xv/xv-3.10a-jumbo-patches-20070520.tar.gz) = 1363802
|
||||
SIZE (xv/xv-3.10a.tar.gz) = 2259124
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2005/06/23 20:23:05 sturm Exp $
|
||||
--- Makefile.orig Thu Jun 23 21:59:31 2005
|
||||
+++ Makefile Thu Jun 23 21:59:31 2005
|
||||
$OpenBSD: patch-Makefile,v 1.2 2007/05/29 21:16:03 naddy Exp $
|
||||
--- Makefile.orig Sun May 27 00:46:00 2007
|
||||
+++ Makefile Sun May 27 01:14:26 2007
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile for xv
|
||||
|
||||
@ -8,45 +8,59 @@ $OpenBSD: patch-Makefile,v 1.1 2005/06/23 20:23:05 sturm Exp $
|
||||
-CC = cc
|
||||
+#CC = cc
|
||||
#CC = gcc -ansi
|
||||
# note that -ansi kills __USE_MISC (gcc 2.95.3), which (at least in Linux)
|
||||
# note that -ansi kills __USE_MISC (gcc 2.95.3), which, at least on Linux,
|
||||
# determines whether stdlib.h includes prototypes for mktemp(), random(), etc.
|
||||
@@ -34,8 +34,8 @@ CCOPTS = -O
|
||||
### In general, if your X11 include files and libX11.a library aren't in the
|
||||
### 'standard' places in which the C compiler looks, you should add '-L' and
|
||||
### '-I' options on the CCOPTS line to tell the compiler where said files are.
|
||||
+CCOPTS += -I$(X11BASE)/include -L$(X11BASE)/lib $(USERCFLAGS)
|
||||
@@ -18,7 +18,7 @@ CC = cc
|
||||
# -Wuninitialized -Wparentheses
|
||||
|
||||
-
|
||||
# BeOS _may_ need to use a different version (below), but probably not
|
||||
CLEANDIR = cleandir
|
||||
|
||||
@@ -47,7 +47,6 @@ MANDIR = $(PREFIX)/man/man1
|
||||
-CCOPTS = -O
|
||||
+CCOPTS:= $(CFLAGS)
|
||||
#
|
||||
# these are the usual optimization and warning options for gcc; all such
|
||||
# warnings but one (mktemp() use) have been eliminated (at least on Linux):
|
||||
@@ -56,13 +56,13 @@ CLEANDIR = cleandir
|
||||
### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
|
||||
### string concatenation, such as "fub" "ar" => "fubar") should update
|
||||
### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
|
||||
-PREFIX = /usr/local
|
||||
+#PREFIX = /usr/local
|
||||
BINDIR = $(PREFIX)/bin
|
||||
-MANDIR = $(PREFIX)/share/man/man1
|
||||
+MANDIR = $(PREFIX)/man/man1
|
||||
MANSUF = 1
|
||||
DOCDIR = $(PREFIX)/doc/xv-3.10a
|
||||
DOCDIR = $(PREFIX)/share/doc/xv
|
||||
LIBDIR = $(PREFIX)/lib/xv
|
||||
-SYSCONFDIR = $(PREFIX)/etc
|
||||
-SYSCONFDIR = /etc
|
||||
+#SYSCONFDIR = /etc
|
||||
DESTDIR =
|
||||
|
||||
|
||||
@@ -64,8 +63,8 @@ buildit: all
|
||||
@@ -87,7 +87,7 @@ buildit: all
|
||||
TIFF = -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
|
||||
###
|
||||
#TIFFDIR = tiff
|
||||
-TIFFDIR = /usr
|
||||
+TIFFDIR = $(LOCALBASE)
|
||||
#TIFFDIR = /usr/local
|
||||
#TIFFDIR = ../../libtiff
|
||||
###
|
||||
@@ -117,7 +117,7 @@ TIFFLIB = -L$(TIFFDIR)/lib -ltiff
|
||||
###
|
||||
JPEG = -DDOJPEG
|
||||
#JPEGDIR = jpeg
|
||||
-JPEGDIR = /usr
|
||||
-#JPEGDIR = /usr/local
|
||||
+#JPEGDIR = /usr
|
||||
+JPEGDIR = $(LOCALBASE)
|
||||
#JPEGDIR = /usr/local
|
||||
#JPEGDIR = ../../libjpeg
|
||||
###
|
||||
JPEGINC = -I$(JPEGDIR)/include
|
||||
@@ -89,11 +88,11 @@ JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
|
||||
#JPEGDIR = /usr/sfw
|
||||
@@ -143,11 +143,11 @@ JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
|
||||
### on your machine, *COMMENT OUT* the following lines
|
||||
###
|
||||
PNG = -DDOPNG
|
||||
-PNGDIR = /usr
|
||||
-#PNGDIR = /usr/local
|
||||
+#PNGDIR = /usr
|
||||
+PNGDIR = $(LOCALBASE)
|
||||
#PNGDIR = /usr/local
|
||||
#PNGDIR = ../../libpng
|
||||
###
|
||||
-PNGINC = -I$(PNGDIR)/include
|
||||
@ -54,31 +68,76 @@ $OpenBSD: patch-Makefile,v 1.1 2005/06/23 20:23:05 sturm Exp $
|
||||
#PNGINC = -I$(PNGDIR)
|
||||
###
|
||||
PNGLIB = -L$(PNGDIR)/lib -lpng
|
||||
@@ -131,8 +130,8 @@ ZLIBLIB = -L$(ZLIBDIR)/lib -lz
|
||||
#TIFF = -DDOTIFF
|
||||
TIFF = -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
|
||||
#TIFFDIR = tiff
|
||||
-TIFFDIR = /usr
|
||||
-#TIFFDIR = /usr/local
|
||||
+#TIFFDIR = /usr
|
||||
+TIFFDIR = $(LOCALBASE)
|
||||
#TIFFDIR = ../../libtiff
|
||||
@@ -179,13 +179,13 @@ ZLIBLIB = -L$(ZLIBDIR)/lib -lz
|
||||
JP2K = -DDOJP2K
|
||||
###
|
||||
TIFFINC = -I$(TIFFDIR)/include
|
||||
@@ -298,7 +297,7 @@ CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZL
|
||||
#JP2KDIR = ../../jasper
|
||||
-JP2KDIR = /usr/local/lib
|
||||
+JP2KDIR = $(LOCALBASE)
|
||||
###
|
||||
#JP2KINC = -I$(JP2KDIR)
|
||||
-JP2KINC = -I/usr/local/include
|
||||
+JP2KINC = -I$(JP2KDIR)/include
|
||||
###
|
||||
#JP2KLIB = -L$(JP2KDIR) -ljasper
|
||||
-JP2KLIB = $(JP2KDIR)/libjasper.a
|
||||
+JP2KLIB = -L$(JP2KDIR)/lib -ljasper
|
||||
|
||||
|
||||
###
|
||||
@@ -260,6 +260,7 @@ PDS = -DDOPDS
|
||||
# For Interactive/SunSoft Unix ISC 4.0 (whatever *that* is!)
|
||||
#MCHN = -DSVR4 -DBSDTYPES
|
||||
|
||||
+MCHN = -I${X11BASE}/include
|
||||
|
||||
#----------'Roll Your Own' Options----------
|
||||
|
||||
@@ -342,7 +343,7 @@ CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZLIBINC) $(JPEG)
|
||||
-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\"
|
||||
|
||||
### remove -lm for BeOS:
|
||||
-LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) -L/usr/X11R6/lib -lX11 -lm
|
||||
+LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) -L$(X11BASE)/lib -lX11 -lm
|
||||
#LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) -lX11
|
||||
-LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lX11 -lm
|
||||
+LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L$(X11BASE)/lib -lX11 -lXdmcp -lXau -lm
|
||||
#LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lX11
|
||||
|
||||
OBJS = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
|
||||
@@ -359,7 +358,6 @@ install: all
|
||||
cp docs/xcmap.man $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF)
|
||||
cp docs/xvp2p.man $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF)
|
||||
cp docs/vdcomp.man $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
|
||||
- cp docs/xvdocs.ps* $(DESTDIR)$(LIBDIR) # or $(DESTDIR)$(DOCDIR)
|
||||
@@ -399,28 +400,18 @@ clean: xvclean
|
||||
# could also do some shell trickery here to attempt mkdir only if dir is
|
||||
# missing (e.g., "test -d <dir> || $(MKDIR) <dir>")
|
||||
install: all
|
||||
- $(MKDIR) $(DESTDIR)$(BINDIR)
|
||||
- cp xv bggen vdcomp xcmap xvpictoppm $(DESTDIR)$(BINDIR)/.
|
||||
- chmod 755 $(DESTDIR)$(BINDIR)/xv $(DESTDIR)$(BINDIR)/bggen \
|
||||
- $(DESTDIR)$(BINDIR)/vdcomp $(DESTDIR)$(BINDIR)/xcmap \
|
||||
- $(DESTDIR)$(BINDIR)/xvpictoppm
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
|
||||
+ $(BSD_INSTALL_PROGRAM) xv bggen vdcomp xcmap xvpictoppm $(DESTDIR)$(BINDIR)/.
|
||||
#
|
||||
- $(MKDIR) $(DESTDIR)$(MANDIR)
|
||||
- cp docs/xv.man $(DESTDIR)$(MANDIR)/xv.$(MANSUF)
|
||||
- cp docs/bggen.man $(DESTDIR)$(MANDIR)/bggen.$(MANSUF)
|
||||
- cp docs/xcmap.man $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF)
|
||||
- cp docs/xvp2p.man $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF)
|
||||
- cp docs/vdcomp.man $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
|
||||
- chmod 644 $(DESTDIR)$(MANDIR)/xv.$(MANSUF) \
|
||||
- $(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
|
||||
- $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
|
||||
- $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
|
||||
- $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
|
||||
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)
|
||||
+ $(BSD_INSTALL_MAN) docs/xv.man $(DESTDIR)$(MANDIR)/xv.$(MANSUF)
|
||||
+ $(BSD_INSTALL_MAN) docs/bggen.man $(DESTDIR)$(MANDIR)/bggen.$(MANSUF)
|
||||
+ $(BSD_INSTALL_MAN) docs/xcmap.man $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF)
|
||||
+ $(BSD_INSTALL_MAN) docs/xvp2p.man $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF)
|
||||
+ $(BSD_INSTALL_MAN) docs/vdcomp.man $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
|
||||
#
|
||||
- $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
|
||||
- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
|
||||
- chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
|
||||
- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
|
||||
+ $(BSD_INSTALL_DATA) docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
|
||||
#
|
||||
#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
|
||||
#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
|
||||
|
||||
tar:
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-config_h,v 1.3 2005/06/23 20:23:06 sturm Exp $
|
||||
--- config.h.orig Thu Jun 23 21:59:31 2005
|
||||
+++ config.h Thu Jun 23 21:59:31 2005
|
||||
@@ -20,7 +20,7 @@
|
||||
# ifdef VMS
|
||||
# define GUNZIP "UNCOMPRESS"
|
||||
# else
|
||||
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
|
||||
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__linux__)
|
||||
# define GUNZIP "/usr/bin/gzip -dq"
|
||||
# else
|
||||
# define GUNZIP "/usr/local/bin/gzip -dq" /* is full path truly needed? */
|
||||
@@ -116,10 +116,9 @@
|
||||
* should not need to be changed
|
||||
*/
|
||||
|
||||
-/* #define GS_PATH "/usr/local/bin/gs" */
|
||||
-#define GS_PATH "/usr/bin/gs"
|
||||
-/* #define GS_LIB "." */
|
||||
-/* #define GS_DEV "ppmraw" */
|
||||
+#define GS_PATH "/usr/local/bin/gs"
|
||||
+#define GS_LIB "/usr/local/share/ghostscript"
|
||||
+#define GS_DEV "ppmraw"
|
||||
|
||||
|
||||
/***************************************************************************
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-xv_h,v 1.3 2005/06/23 20:23:06 sturm Exp $
|
||||
--- xv.h.orig Thu Jun 23 21:59:31 2005
|
||||
+++ xv.h Thu Jun 23 21:59:32 2005
|
||||
@@ -345,7 +345,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef S_IRWUSR
|
||||
-# define S_IRWUSR (S_IRUSR|__S_IWRITE)
|
||||
+# define S_IRWUSR (S_IRUSR|S_IWUSR)
|
||||
#endif
|
||||
|
||||
#ifndef MAXPATHLEN
|
||||
13
graphics/xv/patches/patch-xvpcd_c
Normal file
13
graphics/xv/patches/patch-xvpcd_c
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-xvpcd_c,v 1.1 2007/05/29 21:16:03 naddy Exp $
|
||||
--- xvpcd.c.orig Sun May 27 00:39:02 2007
|
||||
+++ xvpcd.c Sun May 27 00:39:29 2007
|
||||
@@ -30,9 +30,6 @@
|
||||
#ifdef HAVE_PCD
|
||||
|
||||
#include <memory.h>
|
||||
-#ifndef alloca
|
||||
-# include <alloca.h> /* "not in POSIX or SUSv3" according to Linux man page */
|
||||
-#endif /* ...but required for Sun C compiler (alloca = macro) */
|
||||
|
||||
#define TRACE 0
|
||||
#if TRACE
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2005/06/23 20:23:06 sturm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2007/05/29 21:16:03 naddy Exp $
|
||||
bin/bggen
|
||||
bin/vdcomp
|
||||
bin/xcmap
|
||||
@ -10,5 +10,5 @@ bin/xvpictoppm
|
||||
@man man/man1/xv.1
|
||||
@man man/man1/xvpictoppm.1
|
||||
share/doc/xv/
|
||||
share/doc/xv/README
|
||||
share/doc/xv/xvdocs.pdf
|
||||
share/doc/xv/xvdocs.ps
|
||||
|
||||
Loading…
Reference in New Issue
Block a user