diff options
Diffstat (limited to 'x11-fonts/xorg-fonts-100dpi')
-rw-r--r-- | x11-fonts/xorg-fonts-100dpi/Makefile | 9 | ||||
-rw-r--r-- | x11-fonts/xorg-fonts-100dpi/distinfo | 4 | ||||
-rw-r--r-- | x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 | 56 |
3 files changed, 62 insertions, 7 deletions
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 58221ada6048..915b435513a9 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org 100dpi bitmap fonts diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-100dpi/distinfo +++ b/x11-fonts/xorg-fonts-100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 new file mode 100644 index 000000000000..8b89779ba476 --- /dev/null +++ b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 @@ -0,0 +1,56 @@ +Index: fonts/bdf/100dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/100dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else +Index: fonts/bdf/75dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/75dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else |