aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1997-07-03 15:37:12 +0800
committerasami <asami@FreeBSD.org>1997-07-03 15:37:12 +0800
commit0a7f3901fb0c37cb8333731b8e855586d2623fb8 (patch)
treed5fe0d9caf5cc07db3e756ea542e2874909ac637
parent62646eabe8716e86bebd387be14462d238520f89 (diff)
downloadfreebsd-ports-gnome-0a7f3901fb0c37cb8333731b8e855586d2623fb8.tar.gz
freebsd-ports-gnome-0a7f3901fb0c37cb8333731b8e855586d2623fb8.tar.zst
freebsd-ports-gnome-0a7f3901fb0c37cb8333731b8e855586d2623fb8.zip
Add magpic and PhotoCD support. The gist of original patch-aa is
already in the distfile patch, and so is part of patch-ac. The new patch-ac is a bug fix (wrong order of arguments -- how did it work for anyone?!?). While I'm here, replace "mkdir -p" with "${MKDIR}", etc. Notified about patch by: ohashi@mickey.ai.kyutech.ac.jp (Takeshi Ohashi)
-rw-r--r--graphics/xv/Makefile20
-rw-r--r--graphics/xv/distinfo1
-rw-r--r--graphics/xv/files/patch-ac18
3 files changed, 17 insertions, 22 deletions
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index b4de147a21c9..785c59b95d22 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -3,13 +3,18 @@
# Date created: 30 October 1994
# Whom: smace
#
-# $Id: Makefile,v 1.12 1996/09/22 08:56:34 andreas Exp $
+# $Id: Makefile,v 1.13 1996/11/18 00:29:59 ache Exp $
#
DISTNAME= xv-3.10a
CATEGORIES= graphics x11
-MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/
-PATCH_SITES= ${MASTER_SITES}
+MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \
+ ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \
+ ftp://ftp.tohoku.ac.jp/pub/X/app/xv/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ xv310a-magpic2-PhotoCD-patch.tar.gz # only from Japan
+
+PATCH_SITES= ftp://ftp.cis.upenn.edu/pub/xv/
PATCHFILES= xv-3.10a.JPEG-patch # xv-3.10a.TIFF-patch (for tiff3.4)
LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
@@ -17,11 +22,14 @@ LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
USE_IMAKE= yes
+pre-patch:
+ @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/Patch.magpic2.PhotoCD.XV310a
+
post-install:
- mkdir -p ${PREFIX}/share/doc/xv
- cp ${WRKSRC}/README ${PREFIX}/share/doc/xv
+ ${MKDIR} ${PREFIX}/share/doc/xv
+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
.if !defined(NOPORTDOCS)
- cp ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
+ ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
.endif
.include <bsd.port.mk>
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 73a353f612a5..5e2da0c67e96 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,2 +1,3 @@
MD5 (xv-3.10a.tar.gz) = 2d4fbeec1561304362781cc8e2f7f72d
+MD5 (xv310a-magpic2-PhotoCD-patch.tar.gz) = d7e2797f14220778b6ac67e59dea3c35
MD5 (xv-3.10a.JPEG-patch) = bd3ac79fa805319f583ccd382bdc825d
diff --git a/graphics/xv/files/patch-ac b/graphics/xv/files/patch-ac
index 0d4217fb1bb9..58bb772b9053 100644
--- a/graphics/xv/files/patch-ac
+++ b/graphics/xv/files/patch-ac
@@ -1,34 +1,20 @@
*** /tmp/T0a03151 Mon Feb 13 18:35:11 1995
--- config.h Mon Feb 13 18:34:49 1995
***************
-*** 13,25 ****
+*** 13,18 ****
* definition appropriately. (use 'which gunzip' to find if you have gunzip,
* and where it lives)
*/
! #undef USE_GUNZIP
#ifdef USE_GUNZIP
- # ifdef VMS
- # define GUNZIP "UNCOMPRESS"
- # else
-! # define GUNZIP "/usr/local/bin/gunzip -q"
- # endif
- #endif
-
---- 13,25 ----
+--- 13,18 ----
* definition appropriately. (use 'which gunzip' to find if you have gunzip,
* and where it lives)
*/
! #define USE_GUNZIP
#ifdef USE_GUNZIP
- # ifdef VMS
- # define GUNZIP "UNCOMPRESS"
- # else
-! # define GUNZIP "/usr/bin/gunzip -q"
- # endif
- #endif
-
***************
*** 88,96 ****
* should not need to be changed