4 files changed, 44 insertions, 34 deletions

diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index da7db615b0e2..7a91f803c571 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xisp
-PORTVERSION=	2.7p1
+PORTVERSION=	2.7p4
 CATEGORIES=	net
 MASTER_SITES=	http://xisp.hellug.gr/release/
 
@@ -17,10 +17,15 @@ COMMENT=	A user-friendly X interface to pppd/chat
 
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
-BROKEN=		Installs into etc/ppp and doesn't clean it up
-
 USE_XPM=	yes
+USE_X_PREFIX=	yes
+
+MAKE_ENV+=	CCFLAGS="${CFLAGS}"
 
 MAN1=		xisp.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/net/xisp/distinfo b/net/xisp/distinfo
index 59759b0ac045..2f0cd74bee56 100644
--- a/net/xisp/distinfo
+++ b/net/xisp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xisp-2.7p1.tar.gz) = f0147d99320a1f7e35c0ef8e41741ba1
-SHA256 (xisp-2.7p1.tar.gz) = 726af8e6a6d6e6c4423c38c4711503bc288a20329070d51645e352e93b55e868
-SIZE (xisp-2.7p1.tar.gz) = 294492
+MD5 (xisp-2.7p4.tar.gz) = 45744144b3d99cdc47e1e3cefb603eab
+SHA256 (xisp-2.7p4.tar.gz) = 1f8c743abac77e3de19f1741e48a711e353992848e5d9d6b9c92bb8c78136791
+SIZE (xisp-2.7p4.tar.gz) = 300156
diff --git a/net/xisp/files/patch-Makefile b/net/xisp/files/patch-Makefile
index babfee239cf8..62e2fa543fde 100644
--- a/net/xisp/files/patch-Makefile
+++ b/net/xisp/files/patch-Makefile
@@ -1,12 +1,14 @@
---- Makefile.orig	Sun Mar  7 17:37:41 2004
-+++ Makefile	Sun Feb 22 06:14:06 2004
-@@ -13,11 +13,11 @@
+--- Makefile.orig	Sun Nov  6 22:38:22 2005
++++ Makefile	Mon Feb 27 08:22:22 2006
+@@ -12,12 +12,12 @@
+ #  Compilation/installation vars (global for all following sections) |
  #=====================================================================
  #
- CC         = gcc
+-CC         = gcc
 -PREFIX     = /usr/local
 -X11PREFIX  = /usr/X11R6
-+PREFIX     = ${LOCALBASE}
++CC         ?= gcc
++PREFIX     = %%PREFIX%%
 +X11PREFIX  = ${X11BASE}
  INCX11     = $(X11PREFIX)/include
  LIBX11     = $(X11PREFIX)/lib
@@ -16,7 +18,7 @@
  MODEM_DEV  = modem
  MODEM_PATH = /dev/$(MODEM_DEV)
 @@ -29,26 +29,26 @@
- # Normal (i.e. SuSE-[678].x) vars; for SuSE-5.x use the lines which
+ # Normal (i.e. SuSE-[6789].x) vars; for SuSE-5.x use the lines which
  # DO NOT include -lcrypt for EXTRALIBS and -DGLIBC2 for EXTRADEFS.
  #-------------------------------------------------------------------
 -BINX11     = $(X11PREFIX)/bin
@@ -60,7 +62,7 @@
  #
  # Debian vars (if your Debian distribution is relatively
  # old and does not use glibc2, use the lines which DO NOT
-@@ -209,29 +209,29 @@
+@@ -208,29 +208,29 @@
  #
  # FreeBSD vars
  #-------------
@@ -93,7 +95,7 @@
 +VARRUN     = /var/run
 +USRLIBPPP  = $(PREFIX)/libexec
 +MANDIR     = $(PREFIX)/man/man1
-+ETCPPP     = /etc/ppp
++ETCPPP     = ${PREFIX}/etc/ppp
 +OPTSDIR    = $(ETCPPP)
 +INSTPPPDIR = $(ETCPPP)
 +PPPDLCKDIR = /var/spool/lock
@@ -101,7 +103,7 @@
 +GROUP      = dialer
 +CHAT_PATH  = /usr/bin
 +PPPD_PATH  = /usr/sbin
-+CCFLAGS    = -Wall -O -DUSE_OPENSSL
++CCFLAGS    ?= -Wall -O -DUSE_OPENSSL
 +EXTRALIBS  = -lcrypto
 +LINKX11    = -Wl,-R$(LIBX11)
 +LINKFORMS  = -L$(LIBFORMS) -lforms
@@ -113,9 +115,18 @@
  #
  #=====================================================================
  #                    Program configuration options                   |
-@@ -407,23 +407,32 @@
+@@ -399,30 +399,39 @@
+ 	  mv -f $(DESTDIR)$(INSTPPPDIR)/ip-up \
+ 	  $(DESTDIR)$(INSTPPPDIR)/ip-up.bak; fi
  	$(INSTALL) -g $(GROUP) -m 750 -o root \
- 	  ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down
+-	  ip-up.install $(DESTDIR)$(INSTPPPDIR)/ip-up
++	  ip-up.install $(DESTDIR)$(INSTPPPDIR)/ip-up.xisp
+ 	if [ -f $(DESTDIR)$(INSTPPPDIR)/ip-down ]; then \
+ 	  mv -f $(DESTDIR)$(INSTPPPDIR)/ip-down \
+ 	  $(DESTDIR)$(INSTPPPDIR)/ip-down.bak; fi
+ 	$(INSTALL) -g $(GROUP) -m 750 -o root \
+-	  ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down
++	  ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down.xisp
  	rm -f ip-up.install ip-down.install
 -	sed -e sM__DEVICEM$(MODEM_PATH)M \
 -	  < xisp.peers.device > xisp_$(MODEM_DEV)
@@ -153,7 +164,7 @@
  
  clean:
  	rm -f *.o xisp xispdial xisprccv xispterm xispid xisp.xpm xisp.1
-@@ -435,10 +444,12 @@
+@@ -434,10 +443,12 @@
  	  $(DESTDIR)$(USRLOCAL)/xisprccv \
  	  $(DESTDIR)$(USRLOCAL)/xispid \
  	  $(DESTDIR)$(MANDIR)/xisp.1 \
diff --git a/net/xisp/pkg-plist b/net/xisp/pkg-plist
index 76853edfc0c2..85948429c20c 100644
--- a/net/xisp/pkg-plist
+++ b/net/xisp/pkg-plist
@@ -1,21 +1,15 @@
-@cwd /etc/ppp
-ip-down
-ip-up
-
-@exec mkdir -p %D/peers
-peers/xisp_cuaa0
-peers/xisp_cuaa1
-peers/xisp_cuaa2
-peers/xisp_cuaa3
-peers/xisp_umodem
-peers/xisp_dialer
-
-@cwd /usr/X11R6
 bin/xisp
 bin/xispid
 bin/xisprccv
-
-@cwd /usr/local
-@exec mkdir -p %D/libexec
+etc/ppp/ip-down.xisp
+etc/ppp/ip-up.xisp
+etc/ppp/peers/xisp_cuaa0
+etc/ppp/peers/xisp_cuaa1
+etc/ppp/peers/xisp_cuaa2
+etc/ppp/peers/xisp_cuaa3
+etc/ppp/peers/xisp_dialer
+etc/ppp/peers/xisp_umodem
 libexec/xispdial
 libexec/xispterm
+@dirrm etc/ppp/peers
+@dirrmtry etc/ppp