summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/dvd-slideshow/Makefile6
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--multimedia/vlc2/Makefile6
-rw-r--r--net/tightvnc/Makefile6
-rw-r--r--print/acroread7/Makefile6
-rw-r--r--print/acroread8/Makefile6
-rw-r--r--print/acroread9/Makefile6
-rw-r--r--print/xpdf-korean/Makefile9
-rw-r--r--sysutils/grub2/Makefile9
-rw-r--r--x11/mlterm/Makefile3
-rw-r--r--x11/mlterm/distinfo4
-rw-r--r--x11/mlterm/patches/patch-etc_font-fb10
12 files changed, 38 insertions, 39 deletions
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 0de17ca58c7..1473a4b63b4 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 09:20:59 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/01 17:58:14 wiz Exp $
# FreeBSD Id: ports/multimedia/dvd-slideshow/Makefile,v 1.12 2007/09/23 04:42:06 edwin Exp
DISTNAME= dvd-slideshow-0.7.5
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvd-slideshow/}
@@ -39,7 +39,7 @@ REPLACE_BASH = dir2slideshow dvd-burn dvd-encode dvd-iso dvd-menu \
SUBST_CLASSES+= fonts
SUBST_STAGE.fonts= post-configure
SUBST_FILES.fonts= dvd-menu dvd-slideshow
-SUBST_SED.fonts= -e 's,/usr/share/fonts/,${X11BASE}/lib/X11/fonts/,g'
+SUBST_SED.fonts= -e 's,/usr/share/fonts/,${PREFIX}/share/fonts/,g'
SUBST_MESSAGE.fonts= Fixing hardcoded fonts paths.
SUBST_CLASSES+= pipeline
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 354ec7db500..b0c8b711680 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.174 2014/06/01 17:56:57 wiz Exp $
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 45
+PKGREVISION= 46
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
@@ -85,7 +85,7 @@ post-install:
# Let's use dejavu-ttf as it has nice unicode support
#
ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?= ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
+DEFAULT_FONT?= ${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf
SUBST_CLASSES+= oss
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 00e839e2ec5..21c9e86ae65 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2014/06/01 17:56:57 wiz Exp $
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
@@ -88,7 +88,7 @@ post-install:
# Let's use dejavu-ttf as it has nice unicode support
#
ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?= ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
+DEFAULT_FONT?= ${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf
SUBST_CLASSES+= oss
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index fdc35df2249..37e35139407 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2014/05/29 23:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2014/06/01 18:04:07 wiz Exp $
DISTNAME= tightvnc-1.3.10
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
DISTFILES= ${DISTNAME}_unixsrc.tar.bz2
@@ -44,7 +44,7 @@ RGBPATH= ${PREFIX}/share/X11/rgb
.else
RGBPATH= ${X11BASE}/lib/X11/rgb
.endif
-FONTPATH= ${X11BASE}/share/fonts/X11/misc,${X11BASE}/share/fonts/X11/75dpi,${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
+FONTPATH= ${PREFIX}/share/fonts/X11/misc,${PREFIX}/share/fonts/X11/75dpi,${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
SUBST_CLASSES+= hpath
SUBST_STAGE.hpath= pre-configure
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index d9e6570cfd6..9f69c036849 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/01 18:06:13 wiz Exp $
DISTNAME= acroread7 # overridden below
PKGNAME= acroread7-7.0.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
@@ -39,7 +39,7 @@ BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
# Additional directories to search for fonts
BUILD_DEFS+= ACROREAD_FONTPATH
-ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?= ${PREFIX}/share/fonts/X11/TTF
INSTALLATION_DIRS= bin Acrobat7
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index a81c99a424d..60fcbd66f22 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 18:06:14 wiz Exp $
DISTNAME= acroread8 # overridden below
PKGNAME= acroread8-8.1.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.7/enu/
@@ -45,7 +45,7 @@ BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
# Additional directories to search for fonts
BUILD_DEFS+= ACROREAD_FONTPATH
-ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?= ${PREFIX}/share/fonts/X11/TTF
INSTALLATION_DIRS= Acrobat8 bin
diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index fe085e1a584..993f4bd030c 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/04/08 10:12:10 obache Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/01 18:06:14 wiz Exp $
DISTNAME= acroread9 # overridden below
PKGNAME= acroread9-9.5.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PKGVERSION_NOREV}/enu/
@@ -40,7 +40,7 @@ BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
# Additional directories to search for fonts
BUILD_DEFS+= ACROREAD_FONTPATH
-ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?= ${PREFIX}/share/fonts/X11/TTF
INSTALLATION_DIRS= Acrobat9 bin ${PKGMANDIR}/man1
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index d9dffe07053..8864fd83a2d 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 13:45:49 asau Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/06/01 18:07:15 wiz Exp $
DISTNAME= xpdf-korean-2005-jul-07
PKGNAME= xpdf-korean-20050707
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
http://gd.tuwien.ac.at/publishing/xpdf/
@@ -24,8 +23,8 @@ INSTALLATION_DIRS+= share/xpdf/korean/CMap
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
- ${ECHO} "displayCIDFontTT Adobe-Korea1 ${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
- ${ECHO} "displayCIDFontTT Unidocs-Korea1 ${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+ ${ECHO} "displayCIDFontTT Adobe-Korea1 ${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+ ${ECHO} "displayCIDFontTT Unidocs-Korea1 ${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
do-install:
${INSTALL_DATA} ${WRKSRC}/Adobe-Korea1.cidToUnicode \
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 1ad5a6c2642..097704bdf43 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/02/19 09:44:56 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/06/01 18:08:24 wiz Exp $
DISTNAME= grub-2.00
-PKGNAME= grub2-2.00
-PKGREVISION= 2
+PKGNAME= ${DISTNAME:S/grub/grub2/}
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -128,7 +127,7 @@ SUBST_CLASSES+= fix-dejavu
SUBST_STAGE.fix-dejavu= pre-configure
SUBST_MESSAGE.fix-dejavu= Fixing dejavu search paths in configure.
SUBST_FILES.fix-dejavu= configure
-SUBST_SED.fix-dejavu= -e 's, \(/usr/share/fonts/dejavu\);, \1 ${PREFIX}/lib/X11/fonts/TTF;,g'
+SUBST_SED.fix-dejavu= -e 's, \(/usr/share/fonts/dejavu\);, \1 ${PREFIX}/share/fonts/X11/TTF;,g'
#
# Do not use `\t' with sed, as it's not portable.
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index f411c1a2f71..465a16cbe2a 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2014/06/01 16:00:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.107 2014/06/01 18:11:35 wiz Exp $
DISTNAME= mlterm-3.3.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 5b82237c5a8..6f303233221 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.46 2014/06/01 16:00:30 tsutsui Exp $
+$NetBSD: distinfo,v 1.47 2014/06/01 18:11:35 wiz Exp $
SHA1 (mlterm-3.3.6.tar.gz) = 02ce7544c17aa6c33ddc4ad4e103d2e2bbfde85a
RMD160 (mlterm-3.3.6.tar.gz) = a4145851a09595f1c07c9151f939a30fc55865bb
Size (mlterm-3.3.6.tar.gz) = 3600399 bytes
SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
-SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
+SHA1 (patch-etc_font-fb) = c9f116aae7640807f4adc4042adc49ddd9805e67
diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb
index 7740f22bb42..b1271ba1933 100644
--- a/x11/mlterm/patches/patch-etc_font-fb
+++ b/x11/mlterm/patches/patch-etc_font-fb
@@ -1,4 +1,4 @@
-$NetBSD: patch-etc_font-fb,v 1.6 2014/03/23 07:04:00 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.7 2014/06/01 18:11:36 wiz Exp $
add more examples for typical NetBSD and pkgsrc installation
@@ -6,7 +6,7 @@ add more examples for typical NetBSD and pkgsrc installation
+++ etc/font-fb
@@ -1,10 +1,17 @@
#DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
-+#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++#DEFAULT = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
#ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz
+#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz
@@ -16,9 +16,9 @@ add more examples for typical NetBSD and pkgsrc installation
JISC6226_1978 = &JISX0208_1983
JISX0208_1990 = &JISX0208_1983
JISX0213_2000_1 = &JISX0208_1983
-+#JISX0213_2000_1=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-1.pcf.gz
-+#JISX0213_2000_2=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-2.pcf.gz
++#JISX0213_2000_1=/usr/pkg/share/fonts/X11/local/jiskan16-2000-1.pcf.gz
++#JISX0213_2000_2=/usr/pkg/share/fonts/X11/local/jiskan16-2000-2.pcf.gz
#ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
-+#ISO10646_UCS4_1 = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++#ISO10646_UCS4_1 = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
ISO10646_UCS4_1_FULLWIDTH = &ISO10646_UCS4_1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 00:57:47 +0000