cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build freetype2 from the XFree sources and add a dependency on

Browse Source 
print/freetype2.
I only got negative feedback with the previous version.
This commit is contained in:
Jean-Marc Zucconi 2001-01-08 14:29:08 +00:00
parent 8e5bd63e09
commit c668c529d8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=36943
5 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/XFree86-4/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.0.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
@ -15,6 +15,8 @@ DISTFILES= X402src-1.tgz X402src-2.tgz
MAINTAINER= jmz@FreeBSD.org
LIB_DEPENDS= freetype.6:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${DIST_SUBDIR}
.if (${MACHINE} != "alpha")
#NO_PACKAGE= package available from XFree86
@ -85,16 +87,10 @@ post-patch:
${WRKSRC}/include/Xarch.h; fi
.endif
pre-build:
@cd ${WRKSRC}/extras/freetype2 && make -f Makefile.freetype
pre-install:
${MKDIR} ${PREFIX}
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/extras/freetype2/lib/libfreetype.a ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/extras/freetype2/lib/libfreetype.so.6 ${PREFIX}/lib
ln -sf ${PREFIX}/lib/libfreetype.so.6 ${PREFIX}/lib/libfreetype.so
.ifndef DISTRIB
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.endif

4
x11/XFree86-4/pkg-plist
View File

@ -273,7 +273,6 @@ include/X11/Xcms.h
include/X11/Xdefs.h
include/X11/Xdmcp.h
include/X11/Xft/Xft.h
include/X11/Xft/XftFreetype.h
include/X11/Xfuncproto.h
include/X11/Xfuncs.h
include/X11/Xlib.h
@ -3253,9 +3252,6 @@ lib/libdpstk.a
lib/libdpstk.so
lib/libdpstk.so.1
lib/libfntstubs.a
lib/libfreetype.a
lib/libfreetype.so
lib/libfreetype.so.6
lib/liboldX.a
lib/liboldX.so
lib/liboldX.so.6

4
x11/XFree86-4/pkg-plist.alpha
View File

@ -272,7 +272,6 @@ include/X11/Xcms.h
include/X11/Xdefs.h
include/X11/Xdmcp.h
include/X11/Xft/Xft.h
include/X11/Xft/XftFreetype.h
include/X11/Xfuncproto.h
include/X11/Xfuncs.h
include/X11/Xlib.h
@ -3250,9 +3249,6 @@ lib/libdpstk.a
lib/libdpstk.so
lib/libdpstk.so.1
lib/libfntstubs.a
lib/libfreetype.a
lib/libfreetype.so
lib/libfreetype.so.6
lib/liboldX.a
lib/liboldX.so
lib/liboldX.so.6

4
x11/XFree86-4/pkg-plist.pc98
View File

@ -273,7 +273,6 @@ include/X11/Xcms.h
include/X11/Xdefs.h
include/X11/Xdmcp.h
include/X11/Xft/Xft.h
include/X11/Xft/XftFreetype.h
include/X11/Xfuncproto.h
include/X11/Xfuncs.h
include/X11/Xlib.h
@ -3253,9 +3252,6 @@ lib/libdpstk.a
lib/libdpstk.so
lib/libdpstk.so.1
lib/libfntstubs.a
lib/libfreetype.a
lib/libfreetype.so
lib/libfreetype.so.6
lib/liboldX.a
lib/liboldX.so
lib/liboldX.so.6

4
x11/XFree86-4/scripts/configure vendored
View File

@ -294,9 +294,7 @@ echo
yesno YES "Do you want to compile with PAM support?"
echo "#define HasPam $answ" >> $F
cp $FILESDIR/Makefile.freetype $WRKDIR/xc/extras/freetype2
(cd $WRKDIR/xc/extras/freetype2; ln -s obj lib; cd include; ln -s ../include freetype2 )
echo "#define Freetype2Dir $WRKDIR/xc/extras/freetype2" >> $F
echo "#define Freetype2Dir $LOCALBASE" >> $F
}
configure