Index: head/x11-toolkits/xview/Makefile =================================================================== --- head/x11-toolkits/xview/Makefile (revision 252369) +++ head/x11-toolkits/xview/Makefile (revision 252370) @@ -1,72 +1,76 @@ # New ports collection makefile for: XView # Date created: 22 November 1994 # Whom: ljo (orig) # # $FreeBSD$ # PORTNAME= xview PORTVERSION= 3.2.1 PORTREVISION= 10 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.efd.lth.se/pub/X11/ \ ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav DISTNAME= xview3.2p1-X11R6 MAINTAINER= ports@FreeBSD.org COMMENT= X Window-System-based Visual/Integrated Environment for Workstations MAKE_JOBS_UNSAFE= yes BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale ONLY_FOR_ARCHS= i386 REINPLACE_ARGS= -i "" USE_IMAKE= yes USE_XORG= x11 USE_LDCONFIG= yes -IMAKEINCLUDE= "-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config" +IMAKEINCLUDE= "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World SUB_FILES= pkg-message MAN1= xview.1 X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c .include .if ${OSVERSION} > 800089 CFLAGS+= -DCOMPAT_43TTY .endif .if ${OSVERSION} > 900007 BROKEN= fails to build with new utmpx .endif pre-configure: @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+;' \ ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl +.if ${OSVERSION} < 800090 + @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \ + ${WRKSRC}/config/XView.tmpl +.endif @${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ ${X11BASE2FIX:C|^|${WRKSRC}/|} @${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \ ${WRKSRC}/util/Imakefile @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\ s|^/\*\*/#*|XCOMM |' post-install: .if !defined{NOPORTDOCS} @(cd ${WRKSRC}/doc; ${MAKE} install) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11-toolkits/xview/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.53 \ No newline at end of property +1.54 \ No newline at end of property Index: head/x11-toolkits/xview/files/patch-config+XView.tmpl =================================================================== --- head/x11-toolkits/xview/files/patch-config+XView.tmpl (revision 252369) +++ head/x11-toolkits/xview/files/patch-config+XView.tmpl (revision 252370) @@ -1,95 +1,102 @@ ---- config/XView.tmpl.orig Mon Sep 29 00:02:17 2003 -+++ config/XView.tmpl Mon Sep 29 00:02:17 2003 -@@ -96,7 +96,7 @@ +--- config/XView.tmpl.orig 2010-04-07 10:28:25.000000000 +0900 ++++ config/XView.tmpl 2010-04-07 10:35:36.000000000 +0900 +@@ -96,11 +96,13 @@ * Work around small conflict with Project.tmpl file */ #if UseInstalled - MKDIRHIER = BourneShell BinDir/mkdirhier + MKDIRHIER = mkdirhier #endif #if OsHasLocale -@@ -192,14 +192,6 @@ +- LOCALE_DEFINES = -DOS_HAS_LOCALE ++ LOCALE_DEFINES = -DOS_HAS_LOCALE -DCOMPAT_43TTY ++#else ++ LOCALE_DEFINES = -DCOMPAT_43TTY + #endif + + #if OsHasMmap +@@ -192,14 +194,6 @@ AS = as */ /* - * use the same trick X11R5 does for defining rules for installed libs - */ -#ifdef UseInstalled -#define _Use(a,b) a -#else -#define _Use(a,b) b -#endif -/* * Temporary directory used during build process before the include * files are installed. This is just a place where symbolic links are * placed to point back to the actual files in the build hierarchy to -@@ -224,7 +216,7 @@ +@@ -224,7 +218,7 @@ * afterwards. */ #ifndef XVIncludeDirName -#define XVIncludeDirName /include +#define XVIncludeDirName include #endif INCDIR = XVIncludeDirName /* -@@ -356,10 +348,10 @@ +@@ -356,10 +350,10 @@ #if SystemV4 SYSV_CLIENT_LIB = -lintl -ldl - XVCLIENTSYSDEFINES = -DSVR4 -DSYSV + XVCLIENTSYSDEFINES = -DSVR4 -DSYSV #else SYSV_CLIENT_LIB = - XVCLIENTSYSDEFINES = -DSUNOS41 + XVCLIENTSYSDEFINES = -DSUNOS41 #endif /* -@@ -371,16 +363,16 @@ +@@ -371,16 +365,16 @@ */ #if XvI18nLevel == 4 - XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5 - XVCLIENTMISCLIB = -lw - XVCLIENTINCLUDES = -I$(OPENWINHOME)/include + XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5 + XVCLIENTMISCLIB = -lw + XVCLIENTINCLUDES = -I$(OPENWINHOME)/include #else - XVCLIENTI18NDEFINES = -DOW_I18N_L3 - XVCLIENTMISCLIB = - XVCLIENTINCLUDES = + XVCLIENTI18NDEFINES = -DOW_I18N_L3 + XVCLIENTMISCLIB = + XVCLIENTINCLUDES = #endif - XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES) + XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES) /* * Define libraries for XView clients -@@ -410,7 +402,7 @@ +@@ -410,7 +404,7 @@ */ #if SharedLibXView # ifndef SharedXViewRev -#if SystemV4 +#if SystemV4 || UseElfFormat # define SharedXViewRev 3 #else # define SharedXViewRev 3.2 -@@ -449,12 +441,8 @@ +@@ -449,12 +443,8 @@ * Include the XView specific makefile macros. */ -/* This is just needed here because X11 is installed with gcc as - a default compiler. - lumpi@dobag.in-berlin.de - #undef CcCmd #define CcCmd cc -#define LibraryCcCmd cc */ +#define LibraryCcCmd cc #include #endif Property changes on: head/x11-toolkits/xview/files/patch-config+XView.tmpl ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property