Bug 43235 - [patch] remove extra file from x11-toolkits/Xaw3d
Summary: [patch] remove extra file from x11-toolkits/Xaw3d
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Christian Weisgerber
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-09-22 08:50 UTC by edwin
Modified: 2002-10-06 19:45 UTC (History)
0 users

See Also:


Attachments
file.diff (640 bytes, patch)
2002-09-22 08:50 UTC, edwin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description edwin 2002-09-22 08:50:01 UTC
After installation of x11-toolkits/Xaw3d, the symlink lib/libXaw3d.so.6
still existed. Also it tried to remove lib/libXaw3d.so.7 twice (once
explicitely, once via %%AWVER%%)

How-To-Repeat: 
make reinstall/deinstall in x11-toolkits/Xaw3d
Comment 1 Christian Weisgerber freebsd_committer freebsd_triage 2002-10-06 03:15:03 UTC
Responsible Changed
From-To: freebsd-ports->naddy

I'm looking into this.
Comment 2 Christian Weisgerber 2002-10-06 03:25:28 UTC
In article <20020922074402.E72206A7124@k7.mavetju> you write:

> >Fix:

I think this one is better.  Do you agree?

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/Xaw3d/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	29 Jan 2002 12:14:14 -0000	1.36
+++ Makefile	6 Oct 2002 02:23:57 -0000
@@ -17,19 +17,15 @@
 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 @@
 	${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}
 
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/Xaw3d/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	11 Aug 2000 01:46:07 -0000	1.12
+++ pkg-plist	6 Oct 2002 02:23:57 -0000
@@ -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
-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de
Comment 3 Christian Weisgerber freebsd_committer freebsd_triage 2002-10-06 19:44:38 UTC
State Changed
From-To: open->closed

Committed.