aboutsummaryrefslogtreecommitdiffstats
path: root/x11/xloadimage/Makefile
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2011-06-15 19:32:04 +0800
committermandree <mandree@FreeBSD.org>2011-06-15 19:32:04 +0800
commit8c576135f5b20cfd73dd6244b4c6f5f7491b3677 (patch)
tree28d2e925173983ef8fc7e6a0b458cdfc284fdea7 /x11/xloadimage/Makefile
parentb3bb8fde292411337c89efe4528fbdb9fd423fd3 (diff)
downloadfreebsd-ports-gnome-8c576135f5b20cfd73dd6244b4c6f5f7491b3677.tar.gz
freebsd-ports-gnome-8c576135f5b20cfd73dd6244b4c6f5f7491b3677.tar.zst
freebsd-ports-gnome-8c576135f5b20cfd73dd6244b4c6f5f7491b3677.zip
Update to Debian patch 16.2, dropping root.c patch from files/patch-lp64.
Rearrange Makefile to make portlint happier, split out CPPFLAGS setting.
Diffstat (limited to 'x11/xloadimage/Makefile')
-rw-r--r--x11/xloadimage/Makefile29
1 files changed, 16 insertions, 13 deletions
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 9becc9f2cdf1..b2d71e96a2a1 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -5,33 +5,36 @@
# $FreeBSD$
#
-VERSION= 4.1
-REVISION= 16
-PORTREVISION= 8
-
PORTNAME= xloadimage
-PORTVERSION= ${VERSION}.${REVISION}
+PORTVERSION= 4.1.16
+PORTREVISION= 9
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTNAME= ${PORTNAME}.${VERSION}
+
PATCH_SITES= ${MASTER_SITE_DEBIAN_POOL}
-PATCHFILES= ${PORTNAME}_${VERSION}-${REVISION}.diff.gz
-PATCH_DIST_STRIP= -p1
+PATCHFILES= ${PORTNAME}_${VERSION}-${REVISION}${PATCHREV}.diff.gz
+PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 Image Loading Utility
-PATCH_STRIP= -p1
-EXTRA_PATCHES= ${WRKSRC}/debian/patches/*.dpatch
-
-USE_XORG= x11
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
+EXTRA_PATCHES= ${WRKSRC}/debian/patches/*.dpatch
+
+PATCH_STRIP= -p1
+VERSION= ${PORTVERSION:R}
+REVISION= ${PORTVERSION:E}
+PATCHREV= .2
+
+USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
+
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= xloadimage.1 uufilter.1
MLINKS= xloadimage.1 xsetbg.1 \