Date: Fri, 3 Jun 2005 13:44:51 +0300 From: Vasil Dimov <vd@datamax.bg> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81833: sysutils/asr-utils: Unbreak (fix pkg-plist) Message-ID: <20050603104451.GA95727@sinanica.bg.datamax> Resent-Message-ID: <200506031050.j53Ao2TL014891@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81833
>Category: ports
>Synopsis: sysutils/asr-utils: Unbreak (fix pkg-plist)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 03 10:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:
System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005 root@sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386
>Description:
Fix sysutils/asr-utils's pkg-plist:
* add dpt directory, which we manually created in do-install
* make libXm.so.1 deinstallation conditional
>How-To-Repeat:
>Fix:
--- asr-utils_pkg-plist.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/asr-utils/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 7 May 2005 23:05:07 -0000 1.6
+++ Makefile 3 Jun 2005 10:37:05 -0000
@@ -17,14 +17,19 @@
MAINTAINER= obrien@FreeBSD.org
COMMENT= Adaptec ASR RAID Management Software
-BROKEN= Incomplete pkg-plist
-
ONLY_FOR_ARCHS= i386
NO_WRKSUBDIR= yes
USE_XLIB= yes
BINS= dptcom dpteng dptscom dptsig raidutil dptmgr
+.if !exists(${X11BASE}/lib/libXm.so.1)
+# we shall install our own libXm.so.1, enable it in pkg-plist
+PLIST_SUB+= LIBXM=""
+.else
+PLIST_SUB+= LIBXM="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/asr-utils/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 25 Jun 2003 17:21:09 -0000 1.1
+++ pkg-plist 3 Jun 2005 10:37:05 -0000
@@ -16,4 +16,6 @@
dpt/dptsig
dpt/raidutil
dpt/read.me
-../X11R6/lib/libXm.so.1
+@dirrm dpt
+%%LIBXM%%@cwd %%X11BASE%%
+%%LIBXM%%lib/libXm.so.1
--- asr-utils_pkg-plist.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050603104451.GA95727>