diff options
| author | ade <ade@FreeBSD.org> | 2000-10-14 04:22:31 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-10-14 04:22:31 +0800 |
| commit | 94d04d20502e07f2291308cfe7095107c73ed822 (patch) | |
| tree | 7cea9ead07347e55077d518d82d0452c99137589 | |
| parent | ef067f9b8ba67ca80546328c2e0c7808fb071c8a (diff) | |
| download | freebsd-ports-gnome-94d04d20502e07f2291308cfe7095107c73ed822.tar.gz freebsd-ports-gnome-94d04d20502e07f2291308cfe7095107c73ed822.tar.zst freebsd-ports-gnome-94d04d20502e07f2291308cfe7095107c73ed822.zip | |
Support CC/CFLAGS/X11BASE/PREFIX properly
Change location of data files from lib/ to share/
PR: 21581
Submitted by: Ports Fury
Approved by: maintainer
| -rw-r--r-- | misc/xpns/Makefile | 18 | ||||
| -rw-r--r-- | misc/xpns/files/patch-aa | 11 | ||||
| -rw-r--r-- | misc/xpns/files/patch-ab | 4 | ||||
| -rw-r--r-- | misc/xpns/pkg-plist | 9 |
4 files changed, 22 insertions, 20 deletions
diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile index eca6f6ea84a2..7323448253f7 100644 --- a/misc/xpns/Makefile +++ b/misc/xpns/Makefile @@ -13,22 +13,24 @@ DISTFILES= pns_source.tar.Z 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 --git a/misc/xpns/files/patch-aa b/misc/xpns/files/patch-aa index 5f7c3205c24b..2eeaaeba199f 100644 --- a/misc/xpns/files/patch-aa +++ b/misc/xpns/files/patch-aa @@ -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 --git a/misc/xpns/files/patch-ab b/misc/xpns/files/patch-ab index 6f224dbc0bda..e79a2e477085 100644 --- a/misc/xpns/files/patch-ab +++ b/misc/xpns/files/patch-ab @@ -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 --git a/misc/xpns/pkg-plist b/misc/xpns/pkg-plist index 83b212afd229..aa9476650671 100644 --- a/misc/xpns/pkg-plist +++ b/misc/xpns/pkg-plist @@ -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/phil.net 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 |