Date: Tue, 23 Mar 1999 23:41:59 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10750: Update port: asfiles-1.0(x11-fm/asfiles) Message-ID: <199903231441.XAA43286@pis.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 10750
>Category: ports
>Synopsis: Update port: asfiles-1.0(x11-fm/asfiles)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 23 06:40:02 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: KIRIYAMA Kazuhiko
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Toba National College of Maritime Technology.
Department of Electronic Mechanical Engineering
>Environment:
>Description:
Updated the port asfiles-1.0(x11-fm/asfiles).
Current modifications are :
(1) Add resource file Files so as to install ${PREFIX}/lib/X11/app-defaults/Files
(2) PREFIX varialization has been done!
Update files are respecively :
[Add] :
-rw-r--r-- 1 kiri staff 193 Mar 23 23:36 x11-fm/asfiles/scripts/post-configure
-rw-r--r-- 1 kiri staff 175 Mar 23 23:36 x11-fm/asfiles/pkg/INSTALL
-rw-r--r-- 1 kiri staff 765 Mar 23 23:36 x11-fm/asfiles/files/patch-aa
[Delete] :
(NONE)
[Update] :
-rw-r--r-- 1 kiri staff 6209 Mar 23 23:36 x11-fm/asfiles/pkg/PLIST
-rw-r--r-- 1 kiri staff 835 Mar 23 23:36 x11-fm/asfiles/Makefile
I put the diff from ports-current in "Fix:".
>How-To-Repeat:
>Fix:
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/x11-fm/asfiles/Makefile ./Makefile
--- /usr/ports/current/x11-fm/asfiles/Makefile Tue Mar 16 02:40:13 1999
+++ ./Makefile Sun Mar 21 22:50:34 1999
@@ -21,5 +20,11 @@
USE_X_PREFIX= yes
MAN1= files.1
MAN3= regexp.3
+
+post-install:
+ ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-aa
+ ${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${PREFIX}/lib/X11/app-defaults/
+ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${MV} ${WRKSRC}/src/Files.ad.orig ${WRKSRC}/src/Files.ad
.include <bsd.port.mk>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/x11-fm/asfiles/files/patch-aa ./files/patch-aa
--- /usr/ports/current/x11-fm/asfiles/files/patch-aa Thu Jan 1 09:00:00 1970
+++ ./files/patch-aa Sun Mar 21 21:32:36 1999
@@ -0,0 +1,19 @@
+--- src/Files.ad.orig Mon Apr 21 12:55:17 1997
++++ src/Files.ad Sun Mar 21 21:29:33 1999
+@@ -5,13 +5,13 @@
+ !***********************************************************************
+
+ ! Search paths for icon files
+-Files*bitmapPath: /usr/local/include/bitmaps
+-Files*pixmapPath: /usr/local/include/pixmaps:/usr/X11/lib/X11/afterstep/icons
++Files*bitmapPath: %%PREFIX%%/include/bitmaps
++Files*pixmapPath: %%PREFIX%%/include/pixmaps:%%PREFIX%%/include/X11/pixmaps
+ ! A pixmap for the background
+ !Files*icon box*backgroundPixmap: /usr/local/pixmaps/Files_back.xpm
+
+ ! System-wide Configuration file
+-Files*configFile: /usr/local/lib/OffiX/Filesrc
++Files*configFile: %%PREFIX%%/share/OffiX/Filesrc
+
+ ! Double click time in milliseconds
+ Files*doubleClickTime: 300
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/x11-fm/asfiles/pkg/INSTALL ./pkg/INSTALL
--- /usr/ports/current/x11-fm/asfiles/pkg/INSTALL Thu Jan 1 09:00:00 1970
+++ ./pkg/INSTALL Sun Mar 21 21:40:08 1999
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+ADDIR=${PKG_PREFIX}/lib/X11/app-defaults
+
+if [ X"$2" = "XPOST-INSTALL" ]; then
+ perl -pe 's/%%PREFIX%%/$ENV{PKG_PREFIX}/g' ${ADDIR}/Files.ad > ${ADDIR}/Files
+fi
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/x11-fm/asfiles/pkg/PLIST ./pkg/PLIST
--- /usr/ports/current/x11-fm/asfiles/pkg/PLIST Sun Jan 3 19:13:05 1999
+++ ./pkg/PLIST Sun Mar 21 21:07:39 1999
@@ -220,6 +220,8 @@
include/pixmaps/Workshop.xpm
include/pixmaps/interface.xpm
include/pixmaps/PDFOmni.xpm
+lib/X11/app-defaults/Files.ad
+@unexec rm -rf %B/Files
share/OffiX/FilesMagic
share/OffiX/Filesrc
@dirrm share/OffiX
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/x11-fm/asfiles/scripts/post-configure ./scripts/post-configure
--- /usr/ports/current/x11-fm/asfiles/scripts/post-configure Thu Jan 1 09:00:00 1970
+++ ./scripts/post-configure Sun Mar 21 21:45:19 1999
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dirs=". src src/bitmaps src/pixmaps src/external src/regexp pixmaps bitmaps"
+
+for d in ${dirs}; do
+ perl -pi -e 's@^(prefix[ \t]*=).*$@$1\${PREFIX}@' ${WRKSRC}/${d}/Makefile
+done
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903231441.XAA43286>