Date: Tue, 26 Sep 2000 15:18:49 -0700 (PDT) From: KATO@FreeBSD.ORG, Tsuguru@FreeBSD.ORG To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21581: Update port: misc/xpns Message-ID: <20000926221849.A34E137B423@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21581
>Category: ports
>Synopsis: Update port: misc/xpns
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 26 15:20:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: tkato@prontomail.ne.jp
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS/X11BASE/PREFIX properly
- Change location of data files from lib/ to share/
Approved by maintainer.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/xpns/Makefile misc/xpns/Makefile
--- /usr/ports/misc/xpns/Makefile Sat Apr 15 00:29:02 2000
+++ misc/xpns/Makefile Fri Aug 11 02:16:00 2000
@@ -13,22 +13,24 @@
MAINTAINER= giffunip@asme.org
-USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
+USE_X_PREFIX= yes
MAKEFILE= makefile
ALL_TARGET= pns
+post-patch:
+ @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xpns
+
do-install:
- ${MKDIR} ${PREFIX}/lib/xpns
- ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
- ${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/lib/xpns/
- ${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/lib/xpns/
${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
-
-post-install:
+ ${MKDIR} ${PREFIX}/libexec/xpns
+ ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/libexec/xpns
+ ${MKDIR} ${PREFIX}/share/xpns
+ ${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/share/xpns
+ ${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/share/xpns
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/xpns
- ${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
+ ${INSTALL_DATA} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns
.endif
.include <bsd.port.mk>
diff -urN /usr/ports/misc/xpns/patches/patch-aa misc/xpns/patches/patch-aa
--- /usr/ports/misc/xpns/patches/patch-aa Tue Jan 5 17:09:05 1999
+++ misc/xpns/patches/patch-aa Fri Aug 11 02:03:29 2000
@@ -1,5 +1,5 @@
---- makefile.orig Wed Jul 14 06:05:14 1993
-+++ makefile Sun Oct 4 14:19:13 1998
+--- makefile.orig Wed Jul 14 20:05:14 1993
++++ makefile Fri Aug 11 02:02:40 2000
@@ -7,19 +7,21 @@
#I = -I/usr/include
@@ -7,11 +7,10 @@
-# OPTIONEN SUN
+# OPTIONEN FreeBSD
#------------------------------------------
--O = -O
+ O = -O
-I = -I/usr/local/X11R5/include
-
-L = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
-+O = -O2
+I = -I$(X11BASE)/include
+L = -L$(X11BASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
@@ -24,8 +23,8 @@
#------------------------------------------
-B = gcc-2.3.3 $O -o
-CC = gcc-2.3.3 $O $I
-+B = gcc $O -o
-+CC = gcc $O $I
++B = $(CC) -o
++CC += $I
#------------------------------------------
# FUNKTIONEN DIR
diff -urN /usr/ports/misc/xpns/patches/patch-ab misc/xpns/patches/patch-ab
--- /usr/ports/misc/xpns/patches/patch-ab Tue Jun 24 15:07:27 1997
+++ misc/xpns/patches/patch-ab Fri Aug 11 02:17:21 2000
@@ -5,9 +5,9 @@
-setenv XAPPLRESDIR $PWD/
-pns
+#!/bin/csh
-+setenv XAPPLRESDIR /usr/X11R6/lib/xpns/
++setenv XAPPLRESDIR %%PREFIX%%/share/xpns/
+# Note pns will dump core if environment is not correct
-+/usr/X11R6/lib/xpns/pns
++%%PREFIX%%/libexec/xpns/pns
diff -urN /usr/ports/misc/xpns/pkg/PLIST misc/xpns/pkg/PLIST
--- /usr/ports/misc/xpns/pkg/PLIST Mon Jul 5 06:47:44 1999
+++ misc/xpns/pkg/PLIST Fri Aug 11 02:00:17 2000
@@ -1,7 +1,7 @@
bin/xpns
-lib/xpns/pns
-lib/xpns/pns.hlp
-lib/xpns/pns.shell
+libexec/xpns/pns
+share/xpns/pns.hlp
+share/xpns/pns.shell
share/doc/xpns/a.net
share/doc/xpns/a1.net
share/doc/xpns/add.net
@@ -10,5 +10,6 @@
share/doc/xpns/rw.net
share/doc/xpns/sub.net
share/doc/xpns/sub2.net
-@dirrm lib/xpns
+@dirrm share/xpns
@dirrm share/doc/xpns
+@dirrm libexec/xpns
>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?20000926221849.A34E137B423>