aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2002-10-07 02:44:12 +0800
committernaddy <naddy@FreeBSD.org>2002-10-07 02:44:12 +0800
commit967d84fae9fc01bda03988a8537a92b2a011ea58 (patch)
treec6c0eccf3dd5b977e36b45c7dae98f3eef2d963d
parentf7806670b4b71a93494b3473a89a9799fc9a2136 (diff)
downloadfreebsd-ports-gnome-967d84fae9fc01bda03988a8537a92b2a011ea58.tar.gz
freebsd-ports-gnome-967d84fae9fc01bda03988a8537a92b2a011ea58.tar.zst
freebsd-ports-gnome-967d84fae9fc01bda03988a8537a92b2a011ea58.zip
Fix a link in the package list conditional on XFree86 3/4.
Modified from PR: 43235 Submitted by: Edwin Groothuis <edwin@mavetju.org>
-rw-r--r--x11-toolkits/Xaw3d/Makefile12
-rw-r--r--x11-toolkits/Xaw3d/pkg-plist2
2 files changed, 6 insertions, 8 deletions
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 42b7cf9dd30a..cadb4501ea15 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -17,19 +17,15 @@ WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
USE_IMAKE= yes
INSTALLS_SHLIB= yes
.if exists(${X11BASE}/bin/XFree86)
-PLIST= ${WRKDIR}/PLIST
+PLIST_SUB= XAWLINK=""
+.else
+PLIST_SUB= XAWLINK="@comment "
.endif
post-extract:
${MKDIR} ${WRKSRC}/X11/Xaw3d
cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
-.if exists(${X11BASE}/bin/XFree86)
-post-build:
- ${CP} ${PKGDIR}/pkg-plist ${PLIST}
- ${ECHO_CMD} "lib/libXaw3d.so.7" >> ${PLIST}
-.endif
-
# Workaround a bug in egcs on FreeBSD/Alpha.
.if ${MACHINE_ARCH} == "alpha"
post-configure:
@@ -41,7 +37,7 @@ post-install:
${MKDIR} ${PREFIX}/share/doc/Xaw3d
${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
.if exists(${X11BASE}/bin/XFree86)
- ${LN} -sf ${X11BASE}/lib/libXaw3d.so.7 ${X11BASE}/lib/libXaw3d.so.6
+ ${LN} -sf libXaw3d.so.${XAWVER} ${X11BASE}/lib/libXaw3d.so.6
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/x11-toolkits/Xaw3d/pkg-plist b/x11-toolkits/Xaw3d/pkg-plist
index baa6fe928760..1b8b2f885248 100644
--- a/x11-toolkits/Xaw3d/pkg-plist
+++ b/x11-toolkits/Xaw3d/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
lib/libXaw3d.a
lib/libXaw3d.so
lib/libXaw3d.so.%%XAWVER%%
+%%XAWLINK%%lib/libXaw3d.so.6
include/X11/Xaw3d/AllWidgets.h
include/X11/Xaw3d/AsciiSink.h
include/X11/Xaw3d/AsciiSinkP.h