diff options
34 files changed, 116 insertions, 102 deletions
diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile index 88479f4e1148..5720b0e5974a 100644 --- a/x11-servers/XttXF86srv-3DLabs/Makefile +++ b/x11-servers/XttXF86srv-3DLabs/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for 3DLabs with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 13 Dec 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_3DLabs diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile index 7860163c1498..e405976b6159 100644 --- a/x11-servers/XttXF86srv-8514/Makefile +++ b/x11-servers/XttXF86srv-8514/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for I8514 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile index 999c48de0be9..0fd87b093dee 100644 --- a/x11-servers/XttXF86srv-AGX/Makefile +++ b/x11-servers/XttXF86srv-AGX/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for AGX with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile index 0faf418c9766..d735de96b8e2 100644 --- a/x11-servers/XttXF86srv-I128/Makefile +++ b/x11-servers/XttXF86srv-I128/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for I128 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_I128 diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile index f3c03ec131f1..5cf61d08ea62 100644 --- a/x11-servers/XttXF86srv-Mach32/Makefile +++ b/x11-servers/XttXF86srv-Mach32/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for Mach32 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile index 3282e7b5ade8..52cdeb770e61 100644 --- a/x11-servers/XttXF86srv-Mach64/Makefile +++ b/x11-servers/XttXF86srv-Mach64/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for Mach64 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -7,12 +7,12 @@ # DISTNAME= xc -PKGNAME= xtt-Mach64-1.2.1 +PKGNAME= xtt-Mach64-${VERSION}.${PATCHLEVEL} CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mach64 diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile index 6e89a16fc212..4beda85f8cd4 100644 --- a/x11-servers/XttXF86srv-Mach8/Makefile +++ b/x11-servers/XttXF86srv-Mach8/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for Mach8 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile index f0229fae4d89..67b67314eda0 100644 --- a/x11-servers/XttXF86srv-Mono/Makefile +++ b/x11-servers/XttXF86srv-Mono/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for Mono with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mono diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile index 1d9ebc834a99..8feb688ca0f1 100644 --- a/x11-servers/XttXF86srv-P9000/Makefile +++ b/x11-servers/XttXF86srv-P9000/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for P9000 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_P9000 diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile index 188dc542f785..440a627fbe81 100644 --- a/x11-servers/XttXF86srv-S3/Makefile +++ b/x11-servers/XttXF86srv-S3/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for S3 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3 diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile index 017b162c6c5d..22b718f6b795 100644 --- a/x11-servers/XttXF86srv-S3V/Makefile +++ b/x11-servers/XttXF86srv-S3V/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for S3V with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3V diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile index b7afd10e8d2f..ce45a6276708 100644 --- a/x11-servers/XttXF86srv-SVGA/Makefile +++ b/x11-servers/XttXF86srv-SVGA/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for SVGA with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_SVGA @@ -20,3 +20,4 @@ MASTERDIR= ${.CURDIR}/../XttXF86srv-common PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" + diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile index 1744b62b5ec5..eaf680dd5fab 100644 --- a/x11-servers/XttXF86srv-VGA16/Makefile +++ b/x11-servers/XttXF86srv-VGA16/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for VGA16 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile index c698ede6fcda..ff80dea05a32 100644 --- a/x11-servers/XttXF86srv-W32/Makefile +++ b/x11-servers/XttXF86srv-W32/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Xserver for W32 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index 0fc5b06d5907..5d2bf753ed33 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: Common Files for Xservers with Xtt -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -9,23 +9,19 @@ DISTNAME= xc PKGNAME?= xtt-common-${VERSION}.${PATCHLEVEL} CATEGORIES= x11-servers -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \ - http://X-TT.dsl.gr.jp/dists/1.x/1.2/ -DISTFILES= X333src-1.tgz X333src-2.tgz \ - xtt-1.2.tar.gz \ - xtt-1.2-to-1.2.1.tar.gz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/fixes/ -PATCHFILES= 3.3.3-3.3.3.1.diff.gz +MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \ + ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \ + http://X-TT.dsl.gr.jp/dists/1.x/1.3/ +DISTFILES= X335src-1.tgz xtt-1.3.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype -RUN_DEPENDS= mkttfdir:${PORTSDIR}/print/perlftlib +RUN_DEPENDS+= mkttfdir:${PORTSDIR}/print/perlftlib -VERSION= 1.2 -PATCHLEVEL= 1 +VERSION= 1.3 +PATCHLEVEL= 0 +SERVER?= common .if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE) USE_SHARED_WRKSRC= YES .endif @@ -37,8 +33,7 @@ DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif USE_X_PREFIX= YES -EXTRACT_ONLY= X333src-1.tgz X333src-2.tgz \ - xtt-1.2.tar.gz xtt-1.2-to-1.2.1.tar.gz +EXTRACT_ONLY= X335src-1.tgz xtt-1.3.tgz BINOWN= root BINGRP= wheel MASTERDIR?= ${.CURDIR}/../XttXF86srv-common @@ -49,20 +44,17 @@ WRKDIR= ${MASTERDIR}/work .endif WRKSRC= ${WRKDIR}/xc DIST_SUBDIR= xc -XTTDIR= ${WRKDIR}/xtt-1.2 -XTTPATCHDIR= ${WRKDIR}/xtt-1.2-to-1.2.1 +XTTDIR= ${WRKDIR}/xtt-1.3 .if !defined(PATCH_DEBUG) XTTPATCHARGS= -p1 -E -t -s -N .else XTTPATCHARGS= -p1 -E .endif -COREPATCHES= shared-libfont-1.0.diff xfs-for-delayed-font-1.0.diff \ - make-xfs-only-1.1.diff xtt-xf333-changes.diff +COREPATCHES= shared-libfont-1.2.diff xfs-for-delayed-font-1.0.diff \ + make-xfs-only-1.3.diff xtt-xf335-changes.diff XTTTARBALL= xtt-core.tar -ADDPATCHES= ${XTTDIR}/contribute/xtt-xfsft-lib.patch \ - ${XTTPATCHDIR}/xtt-core.diff +ADDPATCHES= ${XTTDIR}/contribute/xtt-xfsft-lib.patch DOCDIR= ${PREFIX}/share/doc/Xtt -SERVER?= common PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP} #PATCH_DIST_STRIP= -p1 @@ -77,11 +69,18 @@ PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP} # This variable will save your time, if you want to make all xtt packages. # ****************** .if defined(USE_SHARED_WRKSRC) +SHARED_COOKIE= ${WRKDIR}/.compiled_by_other_server_ports CONFIGURE_COOKIE= ${WRKDIR}/.configure_done.${SERVER} BUILD_COOKIE= ${WRKDIR}/.build_done.${SERVER} INSTALL_COOKIE= ${WRKDIR}/.install_done.${SERVER} PACKAGE_COOKIE= ${WRKDIR}/.package_done.${SERVER} TMPPLIST= ${WRKDIR}/.PLIST.${SERVER}.mktmp +.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE) +EXTRACT_ONLY= +.endif +.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE) +NO_BUILD= YES +.endif .if defined(COMPILE_ALL_SERVERS_AT_ONCE) && ${SERVER} != xfs ALL_SERVER= XF86_3DLabs XF86_8514 XF86_AGX XF86_I128 XF86_Mach32 \ XF86_Mach64 XF86_Mach8 XF86_Mono XF86_P9000 XF86_S3 XF86_S3V \ @@ -100,16 +99,16 @@ ALL_SERVER= ${SERVER} HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} .endif -HOSTDEFLOCAL= ${WRKDIR}/host.def.local +LOCALFILE= host.def.local +HOSTDEFLOCAL= ${WRKDIR}/${LOCALFILE} +HOSTDEFDST= ${WRKSRC}/config/cf/${LOCALFILE} +HOSTDEFORG= ${WRKSRC}/config/cf/host.def .if ${SERVER} == xfs ALL_TARGET= xfs -HOSTDEFDST= ${WRKSRC}/config/cf/host.def.xfs -.elif ${SERVER} == common +.elif ${SERVER} == common && !defined(COMPILE_ALL_SERVERS_AT_ONCE) ALL_TARGET= libfont -HOSTDEFDST= ${WRKSRC}/config/cf/host.def .else ALL_TARGET= World -HOSTDEFDST= ${WRKSRC}/config/cf/host.def .endif .include <bsd.port.pre.mk> @@ -145,17 +144,15 @@ pre-patch: ${TAR} xf ${XTTDIR}/${XTTTARBALL} -C ${WRKSRC}/lib/font; \ for i in ${ADDPATCHES} ; do \ ${PATCH} ${XTTPATCHARGS} < $${i}; \ - done; \ - cd ${XTTDIR}/doc; \ - ${PATCH} ${XTTPATCHARGS} < ${XTTPATCHDIR}/xtt-doc.diff ) + done ) pre-configure: - @( \ - ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ - (cd ${WRKDIR} ; ${XMKMF} ; \ - ${SETENV} ${MAKE_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \ + @( ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ + (cd ${WRKDIR} ; ${XMKMF} ; \ + ${SETENV} ${SCRIPT_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \ FILESDIR=${FILESDIR} ${MAKE}) ; \ - ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ) + ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ; \ + ${ECHO} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} ) .if ${SERVER} == common do-install: @@ -185,15 +182,22 @@ do-install: .if defined(USE_SHARED_WRKSRC) post-configure: @( \ - cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \ + cd ${WRKDIR} ; \ + for i in ${ALL_SERVER} ; do \ ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${CONFIGURE_COOKIE} .${SERVER}`.$${i} ; \ done ) +.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE)) + @${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE} +.endif post-build: @( \ cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \ ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.$${i} ; \ done ) +.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE)) + @${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE} +.endif post-install: @( \ diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo index 27c62edc5d08..04670184e164 100644 --- a/x11-servers/XttXF86srv-common/distinfo +++ b/x11-servers/XttXF86srv-common/distinfo @@ -1,6 +1,4 @@ -MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985 -MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039 -MD5 (xc/xtt-1.2.tar.gz) = 15585e87ffaa35de7cf80ca17fd02246 -MD5 (xc/xtt-1.2-to-1.2.1.tar.gz) = 157b175a19e56b5dabeb9d3f88de9533 -MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 07cfaf1e17ea57b3b701ec59814f8c73 +MD5 (xc/X335src-1.tgz) = 9bc6e1b45a19eab01e2618c8eca01cbc +MD5 (xc/X335src-2.tgz) = 30bd83eed999e79a92969a0c26615c61 +MD5 (xc/xtt-1.3.tgz) = f4c9efdb90d848701c305e2955149920 MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile index 5d1f4447d7f7..7560f6eabb1b 100644 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ b/x11-servers/XttXF86srv-common/files/Imakefile @@ -35,7 +35,7 @@ initialize:: ${ECHO_MSG} " Now checking your XFree86 environment."; \ rm -f ${CONFFILE}; \ ${ECHO} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \ - ${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include" >> ${CONFFILE}; \ + ${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype" >> ${CONFFILE}; \ ${ECHO} "#undef XF86SVGAServer" >> ${CONFFILE}; \ ${ECHO} "#undef XF86VGA16Server" >> ${CONFFILE}; \ ${ECHO} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \ diff --git a/x11-servers/XttXF86srv-common/files/patch-ab b/x11-servers/XttXF86srv-common/files/patch-ab new file mode 100644 index 000000000000..1f204572627b --- /dev/null +++ b/x11-servers/XttXF86srv-common/files/patch-ab @@ -0,0 +1,9 @@ +--- lib/font/X-TrueType/BIG5ETEN/Imakefile.orig Fri Nov 26 04:47:12 1999 ++++ lib/font/X-TrueType/BIG5ETEN/Imakefile Fri Nov 26 04:47:22 1999 +@@ -1,6 +1,6 @@ + /* code converter: BIG5ETEN */ + +-#define ModuleName BIG5 ++#define ModuleName BIG5ETEN + SRCS = BIG5ETENtoUCS2.c main.c + OBJS = BIG5ETENtoUCS2.o main.o diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist index 853e69d7930c..2c16549caf9b 100644 --- a/x11-servers/XttXF86srv-common/pkg-plist +++ b/x11-servers/XttXF86srv-common/pkg-plist @@ -16,8 +16,10 @@ include/X11/fonts/codeconv/xttcommon.h lib/modules/codeconv/ARABIC.so lib/modules/codeconv/ARMSCII8.so lib/modules/codeconv/BIG5.so +lib/modules/codeconv/BIG5ETEN.so lib/modules/codeconv/DOSENCODING.so lib/modules/codeconv/GB2312.so +lib/modules/codeconv/GEORGIAN.so lib/modules/codeconv/ISO8859_1.so lib/modules/codeconv/ISO8859_10.so lib/modules/codeconv/ISO8859_11.so @@ -42,7 +44,7 @@ lib/modules/codeconv/TCVN.so lib/modules/codeconv/VISCII.so lib/libfont.a lib/libfont.so -lib/libfont.so.1.1 +lib/libfont.so.1.3 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm share/doc/Xtt diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile index c0fae4f31328..53549674a4fb 100644 --- a/x11-servers/XttXF86srv-xfs/Makefile +++ b/x11-servers/XttXF86srv-xfs/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X Font Server with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= xfs diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile index 3e0639f2e5e4..f8e412d0d2f5 100644 --- a/x11-servers/XttXF98srv-EGC/Makefile +++ b/x11-servers/XttXF98srv-EGC/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for EGC with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile index b94fcba48420..7442c5465b8a 100644 --- a/x11-servers/XttXF98srv-GA968/Makefile +++ b/x11-servers/XttXF98srv-GA968/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for GA968 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile index b858e0acfe01..327b1294ea47 100644 --- a/x11-servers/XttXF98srv-GANBWAP/Makefile +++ b/x11-servers/XttXF98srv-GANBWAP/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for GANBWAP with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile index d6a855e6a7a9..63bffde2e4c1 100644 --- a/x11-servers/XttXF98srv-MGA/Makefile +++ b/x11-servers/XttXF98srv-MGA/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for MGA with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile index a0e2b15af2e6..6258ca2a4050 100644 --- a/x11-servers/XttXF98srv-NEC480/Makefile +++ b/x11-servers/XttXF98srv-NEC480/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for NEC480 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile index 09bbe70d4838..8ecaaca26942 100644 --- a/x11-servers/XttXF98srv-NECS3/Makefile +++ b/x11-servers/XttXF98srv-NECS3/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for NECS3 with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile index 1f73197bfd09..445d773348ef 100644 --- a/x11-servers/XttXF98srv-NKVNEC/Makefile +++ b/x11-servers/XttXF98srv-NKVNEC/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for NKVNEC with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile index 2a692caa00e4..5a61fb05b4e8 100644 --- a/x11-servers/XttXF98srv-PWLB/Makefile +++ b/x11-servers/XttXF98srv-PWLB/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for PWLB with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile index 6f3fa49822d3..ba9bf93c25c5 100644 --- a/x11-servers/XttXF98srv-PWSKB/Makefile +++ b/x11-servers/XttXF98srv-PWSKB/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for PWSKB with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile index 05296714e328..5b41b17e8584 100644 --- a/x11-servers/XttXF98srv-SVGA/Makefile +++ b/x11-servers/XttXF98srv-SVGA/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for SVGA with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile index 47e498de104d..1be0c2ce9b99 100644 --- a/x11-servers/XttXF98srv-TGUI/Makefile +++ b/x11-servers/XttXF98srv-TGUI/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for TGUI with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile index 08ede0072f6e..1baa79f8cd75 100644 --- a/x11-servers/XttXF98srv-WABEP/Makefile +++ b/x11-servers/XttXF98srv-WABEP/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for WABEP with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile index d38a4ab99bb0..e469c720f563 100644 --- a/x11-servers/XttXF98srv-WABS/Makefile +++ b/x11-servers/XttXF98srv-WABS/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for WABS with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile index 664c6617626f..aeacb490f7f7 100644 --- a/x11-servers/XttXF98srv-WSNA/Makefile +++ b/x11-servers/XttXF98srv-WSNA/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: X98server for WSNA with X True Type -# Version required: 1.2.1 +# Version required: 1.3.0 # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> # @@ -12,7 +12,7 @@ CATEGORIES= x11-servers MAINTAINER= nakaji@tutrp.tut.ac.jp -LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common ONLY_FOR_ARCHS= i386 |