svn commit: r381588 - in head/x11-toolkits: xview xview-clients
Cy Schubert
cy at FreeBSD.org
Thu Mar 19 02:21:27 UTC 2015
Author: cy
Date: Thu Mar 19 02:21:24 2015
New Revision: 381588
URL: https://svnweb.freebsd.org/changeset/ports/381588
QAT: https://qat.redports.org/buildarchive/r381588/
Log:
Fix conflict, file ownership, and build issues.
Modified:
head/x11-toolkits/xview-clients/Makefile
head/x11-toolkits/xview-clients/pkg-plist
head/x11-toolkits/xview/Makefile
head/x11-toolkits/xview/pkg-plist
Modified: head/x11-toolkits/xview-clients/Makefile
==============================================================================
--- head/x11-toolkits/xview-clients/Makefile Thu Mar 19 01:07:15 2015 (r381587)
+++ head/x11-toolkits/xview-clients/Makefile Thu Mar 19 02:21:24 2015 (r381588)
@@ -3,14 +3,14 @@
PORTNAME= xview-clients
PORTVERSION= 3.2.1.4.19c
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \
http://komquats.com/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= cy
DISTNAME= xview-3.2p1.4-19c
-EXTRACT_ONLY= # empty
+# EXTRACT_ONLY= # empty
MAINTAINER= cy at FreeBSD.org
COMMENT= OpenLook applications and man pages
@@ -18,24 +18,48 @@ COMMENT= OpenLook applications and man p
CONFLICTS= props-1.0
MAKE_JOBS_UNSAFE= yes
-EXTRACT_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:patch
-CONFIGURE_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:configure
+PATCHDIR= ${PORTSDIR}/x11-toolkits/xview/files
LIB_DEPENDS= libxview.so:${PORTSDIR}/x11-toolkits/xview
USES= imake
USE_XORG= x11 xext
ALL_TARGET= Clients
-BROKEN= conflicts with its depends
+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 <bsd.port.pre.mk>
+.if ${OSVERSION} > 800089
+CFLAGS+= -DCOMPAT_43TTY
+.endif
+
IMAKECPPFLAGS+= -DXVDestDir=${STAGEDIR}${PREFIX}
post-extract:
- ${LN} -sf $$(${MAKE} -C ${PORTSDIR}/x11-toolkits/xview -V WRKDIR)/${DISTNAME} ${WRKSRC}
+ @${MV} ${WRKSRC}/xview.man ${WRKSRC}/XView.man
+
+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/+${PREFIX}/+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 |'
do-install:
@cd ${WRKSRC}/clients; ${MAKE} install install.man
+ @${INSTALL_DATA} ${WRKSRC}/misc/support/textedit.info ${STAGEDIR}${PREFIX}/lib/help/textedit.info
.include <bsd.port.post.mk>
Modified: head/x11-toolkits/xview-clients/pkg-plist
==============================================================================
--- head/x11-toolkits/xview-clients/pkg-plist Thu Mar 19 01:07:15 2015 (r381587)
+++ head/x11-toolkits/xview-clients/pkg-plist Thu Mar 19 02:21:24 2015 (r381588)
@@ -8,6 +8,7 @@ bin/textedit
lib/help/clock.info
lib/help/olwm.info
lib/help/props.info
+lib/help/textedit.info
lib/help/workspace.info
lib/openwin-menu
lib/openwin-menu-programs
Modified: head/x11-toolkits/xview/Makefile
==============================================================================
--- head/x11-toolkits/xview/Makefile Thu Mar 19 01:07:15 2015 (r381587)
+++ head/x11-toolkits/xview/Makefile Thu Mar 19 02:21:24 2015 (r381588)
@@ -3,7 +3,7 @@
PORTNAME= xview
PORTVERSION= 3.2.1.4.19c
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \
http://komquats.com/distfiles/ \
Modified: head/x11-toolkits/xview/pkg-plist
==============================================================================
--- head/x11-toolkits/xview/pkg-plist Thu Mar 19 01:07:15 2015 (r381587)
+++ head/x11-toolkits/xview/pkg-plist Thu Mar 19 02:21:24 2015 (r381588)
@@ -523,10 +523,6 @@ lib/.ttyswrc
lib/text_extras_menu
lib/textswrc
lib/ttyswrc
-lib/help/clock.info
-lib/help/olwm.info
-lib/help/props.info
-lib/help/textedit.info
lib/help/textsw.info
lib/help/ttysw.info
lib/help/xview.info
More information about the svn-ports-head
mailing list