aboutsummaryrefslogtreecommitdiff
path: root/graphics/xpaint
diff options
context:
space:
mode:
authorJohan van Selst <johans@FreeBSD.org>2014-04-21 13:16:06 +0000
committerJohan van Selst <johans@FreeBSD.org>2014-04-21 13:16:06 +0000
commit77cc7f502c047a066b936f47e4de72783fb87311 (patch)
treefd982282cb45018008ecb1ac132678afaf04f253 /graphics/xpaint
parentdd918e15cfa734f8996aec6adad60e71fd9b6a2e (diff)
downloadports-77cc7f502c047a066b936f47e4de72783fb87311.tar.gz
ports-77cc7f502c047a066b936f47e4de72783fb87311.zip
Notes
Diffstat (limited to 'graphics/xpaint')
-rw-r--r--graphics/xpaint/Makefile8
-rw-r--r--graphics/xpaint/distinfo4
-rw-r--r--graphics/xpaint/files/patch-Makefile.in12
3 files changed, 11 insertions, 13 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index d5e0db43c102..542e2b512ee6 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= xpaint
-PORTVERSION= 2.9.10
-PORTREVISION= 1
+PORTVERSION= 2.9.10.2
CATEGORIES= graphics
-MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= johans@FreeBSD.org
COMMENT= Simple paint program
@@ -22,12 +21,11 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
RUN_DEPENDS= psselect:${PORTSDIR}/print/psutils \
bash:${PORTSDIR}/shells/bash
-USE_BZIP2= yes
USE_XORG= xft xmu xpm
USE_AUTOTOOLS= libtool
USE_GHOSTSCRIPT_RUN=yes
GNU_CONFIGURE= yes
-USES= shebangfix
+USES= shebangfix tar:bzip2
SHEBANG_FILES= share/bin/imgmerge share/bin/xpaint_ocr
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 5af5bf17ab03..1173b95a406d 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpaint-2.9.10.tar.bz2) = f5302f7fb2cd803acedcec194b042c32a3699d4dba71d8d01d479a136e878d57
-SIZE (xpaint-2.9.10.tar.bz2) = 1320151
+SHA256 (xpaint-2.9.10.2.tar.bz2) = 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6
+SIZE (xpaint-2.9.10.2.tar.bz2) = 1245813
diff --git a/graphics/xpaint/files/patch-Makefile.in b/graphics/xpaint/files/patch-Makefile.in
index c8817696ae4f..3140445e9b72 100644
--- a/graphics/xpaint/files/patch-Makefile.in
+++ b/graphics/xpaint/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2013-01-26 15:21:12.000000000 +0100
-+++ Makefile.in 2014-01-25 23:16:07.000000000 +0100
-@@ -283,7 +283,7 @@ top_builddir = @top_builddir@
+--- Makefile.in.orig 2014-04-17 16:50:14.000000000 +0200
++++ Makefile.in 2014-04-21 15:13:31.000000000 +0200
+@@ -358,7 +358,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
BINDIR = $(prefix)/bin
SHAREDIR = $(prefix)/share/xpaint
@@ -9,7 +9,7 @@
PRINT_COMMAND = lpr
LPCCMD = /usr/sbin/lpc status
#define LPCCMD
-@@ -1005,14 +1005,14 @@ docs: INSTALL README TODO ChangeLog
+@@ -1041,14 +1041,14 @@ docs: INSTALL README TODO ChangeLog
.PHONY:
version.h:
@@ -21,13 +21,13 @@
- $(CC) substads.c -o $@
+ $(CC) $(CFLAGS) substads.c -o $@
- preproc: preproc.c
+ preproc: preproc.c version.h
- $(CC) preproc.c -o $@
+ $(CC) $(CFLAGS) preproc.c -o $@
DefaultRC.txt.h: substads DefaultRC
./substads -ad2c DefaultRC $@
-@@ -1020,21 +1020,20 @@ DefaultRC.txt.h: substads DefaultRC
+@@ -1056,21 +1056,20 @@ DefaultRC.txt.h: substads DefaultRC
messages.h: preproc
./preproc > messages.h