- Update to Debian revision #6: add support for PNG.

- Add Debian revision to PKGNAME.
- Update MASTER_SITES for Debian patch location.
- Pull COMMENT into Makefile.
- General clean-up.
This commit is contained in:
naddy 2001-04-14 01:59:57 +00:00
parent b9c65bd862
commit 047444f0db
7 changed files with 48 additions and 64 deletions

View File

@ -1,19 +1,14 @@
# $OpenBSD: Makefile,v 1.11 2001/01/18 00:36:31 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2001/04/14 01:59:57 naddy Exp $
DISTNAME= xloadimage.4.1
PKGNAME= xloadimage-4.1
COMMENT= "graphics file viewer for X11"
VERSION= 4.1
REVISION= 6 # Debian
DISTNAME= xloadimage.${VERSION}
PKGNAME= xloadimage-${VERSION}.${REVISION}
CATEGORIES= x11 graphics
NEED_VERSION= 1.319
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
MASTER_SITES0= ftp://ftp.debian.org/debian/dists/woody/main/source/graphics/ \
ftp://ftp.de.debian.org/debian/dists/woody/main/source/graphics/
PATCHFILES= xloadimage_4.1-5.diff.gz:0
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= jpeg.62::graphics/jpeg \
tiff.35::graphics/tiff
NEED_VERSION= 1.363
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -22,27 +17,41 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
MASTER_SITES0= ftp://ftp.debian.org/debian/pool/main/x/xloadimage/ \
ftp://ftp.de.debian.org/debian/pool/main/x/xloadimage/
PATCHFILES= xloadimage_${VERSION}-${REVISION}.diff.gz:0
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= jpeg.62::graphics/jpeg \
png.1::graphics/png \
tiff.35::graphics/tiff
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
LDFLAGS='-L${LOCALBASE}/lib'
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
post-patch:
@chmod a+rx ${WRKSRC}/configure
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xloadimage
${INSTALL_PROGRAM} ${WRKBUILD}/xloadimage ${PREFIX}/bin
@cd ${PREFIX}/bin && \
ln -sf xloadimage xsetbg && \
ln -sf xloadimage xview
ln -sf xloadimage xsetbg && \
ln -sf xloadimage xview
${INSTALL_PROGRAM} ${WRKBUILD}/uufilter ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${PREFIX}/man/man1/xloadimage.1
@cd ${PREFIX}/man/man1 && \
ln -sf xloadimage.1 xsetbg.1 && \
ln -sf xloadimage.1 xview.1
ln -sf xloadimage.1 xsetbg.1 && \
ln -sf xloadimage.1 xview.1
${INSTALL_MAN} ${WRKSRC}/uufilter.man ${PREFIX}/man/man1/uufilter.1
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xloadimage
${INSTALL_DATA} ${WRKSRC}/xloadimagerc \
${PREFIX}/share/examples/xloadimagerc-sample
${PREFIX}/share/examples/xloadimagerc-sample
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
MD5 (xloadimage.4.1.tar.gz) = 7331850fc04056ab8ae6b5725d1fb3d2
MD5 (xloadimage_4.1-5.diff.gz) = 244ce730b8a513610e5552d003c57350
MD5 (xloadimage_4.1-6.diff.gz) = 37d6d6d7108ed53e83b160111b883b54
RMD160 (xloadimage.4.1.tar.gz) = 000271b40f58601cd1057b4e99c31a30da6e10af
RMD160 (xloadimage_4.1-5.diff.gz) = 4dc38a2969b1bd6b590f6e08b70c80e08c602edc
RMD160 (xloadimage_4.1-6.diff.gz) = 00bf474f1e7f8b38f853b9d5f7dac234141a4187
SHA1 (xloadimage.4.1.tar.gz) = 0a8ee9b185702750706f68e4a34e086873f17690
SHA1 (xloadimage_4.1-5.diff.gz) = ff0b8d6cdcfa612d3a6a5831ac4589cfa6aa5842
SHA1 (xloadimage_4.1-6.diff.gz) = 43b05d9757a462d5173020d58a3fb240cd054432

View File

@ -1,20 +1,12 @@
--- Makefile.in.orig Sun Aug 6 06:12:41 2000
+++ Makefile.in Sun Aug 6 06:16:15 2000
$OpenBSD: patch-Makefile.in,v 1.2 2001/04/14 01:59:58 naddy Exp $
--- Makefile.in.orig Sat Apr 14 03:19:51 2001
+++ Makefile.in Sat Apr 14 03:20:47 2001
@@ -4,7 +4,7 @@
CC = @CC@
DEFS = @DEFS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @X_CFLAGS@ @CPPFLAGS@
XLIB = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
XLIB = @X_LIBS@ -lX11 @X_EXTRA_LIBS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -24,7 +24,7 @@
$(PROG): $(OBJS)
./build-info
$(CC) $(CFLAGS) -c $(DEFS) build.c
- $(CC) -o $@ $(OBJS) build.o$(LDFLAGS) $(XLIB) $(LIBS)
+ $(CC) -o $@ $(OBJS) build.o $(LDFLAGS) $(XLIB) $(LIBS)
uufilter: uufilter.c
$(CC) $(CFLAGS) $(DEFS) uufilter.c -o $@

View File

@ -1,16 +0,0 @@
--- vicar.c.orig Sun Aug 6 06:23:50 2000
+++ vicar.c Sun Aug 6 06:35:44 2000
@@ -11,9 +11,12 @@
#define LINES label[8]
#define SAMPLES label[6]
+#include "image.h"
+
#include <stdio.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
-#include "image.h"
+#endif
#include <sys/types.h>
FILE *fp,*fopen();

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xloadimage.man,v 1.1 2000/08/06 11:51:40 brad Exp $
--- xloadimage.man.orig Fri Jul 28 20:02:41 2000
+++ xloadimage.man Fri Jul 28 20:05:57 2000
@@ -633,7 +633,6 @@
$OpenBSD: patch-xloadimage.man,v 1.2 2001/04/14 01:59:58 naddy Exp $
--- xloadimage.man.orig Sat Apr 14 03:01:24 2001
+++ xloadimage.man Sat Apr 14 03:10:56 2001
@@ -633,7 +633,6 @@ distribution.
xloadimage - the image loader and viewer
xsetbg - pseudonym which quietly sets the background
xview - pseudonym which views in a window

View File

@ -1 +0,0 @@
graphics file viewer for X11

View File

@ -1,5 +1,5 @@
Can view niff, sunraster, gif, jpeg, tiff, fbm, cmuraster, pbm, faces, rle,
xwd, vff, mcidas, vicar, pcx, gem, macpaint, xpm and xbm files. Can view
images, put them on the root window, or dump them. Does a variety of
processing, including: clipping, dithering, depth reduction, zoom,
brightening/darkening and merging.
Can view png, jpeg, gif, tiff, niff, sunraster, fbm, cmuraster,
pbm, faces, rle, xwd, vff, mcidas, vicar, pcx, gem, macpaint, xpm
and xbm files. Can view images, put them on the root window, or
dump them. Does a variety of processing, including: clipping,
dithering, depth reduction, zoom, brightening/darkening and merging.