diff options
author | cy <cy@FreeBSD.org> | 2015-03-19 10:21:24 +0800 |
---|---|---|
committer | cy <cy@FreeBSD.org> | 2015-03-19 10:21:24 +0800 |
commit | b2ac659adb4372a6ff687ef590e7d86e06e8b3b1 (patch) | |
tree | 20e23eae39736e0c1a602dc02dc82fc7f5a2c1d9 /x11-toolkits | |
parent | e8aca23482e1908d9716ab779e796e781f1d5fd9 (diff) | |
download | freebsd-ports-gnome-b2ac659adb4372a6ff687ef590e7d86e06e8b3b1.tar.gz freebsd-ports-gnome-b2ac659adb4372a6ff687ef590e7d86e06e8b3b1.tar.zst freebsd-ports-gnome-b2ac659adb4372a6ff687ef590e7d86e06e8b3b1.zip |
Fix conflict, file ownership, and build issues.
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/xview-clients/Makefile | 36 | ||||
-rw-r--r-- | x11-toolkits/xview-clients/pkg-plist | 1 | ||||
-rw-r--r-- | x11-toolkits/xview/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/xview/pkg-plist | 4 |
4 files changed, 32 insertions, 11 deletions
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index 81ac6bc778fc..e7771fd25992 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -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@FreeBSD.org COMMENT= OpenLook applications and man pages @@ -18,24 +18,48 @@ COMMENT= OpenLook applications and man pages 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> diff --git a/x11-toolkits/xview-clients/pkg-plist b/x11-toolkits/xview-clients/pkg-plist index 137178060b87..85d9422709ed 100644 --- a/x11-toolkits/xview-clients/pkg-plist +++ b/x11-toolkits/xview-clients/pkg-plist @@ -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 diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile index 880f8587e4f9..1bf21352d8ef 100644 --- a/x11-toolkits/xview/Makefile +++ b/x11-toolkits/xview/Makefile @@ -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/ \ diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist index 76ac447fa4c9..8704f4c3d1db 100644 --- a/x11-toolkits/xview/pkg-plist +++ b/x11-toolkits/xview/pkg-plist @@ -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 |