diff options
-rw-r--r-- | net/rdesktop/Makefile | 23 | ||||
-rw-r--r-- | net/rdesktop/distinfo | 2 | ||||
-rw-r--r-- | net/rdesktop/files/patch-Makefile | 35 | ||||
-rw-r--r-- | net/rdesktop/files/patch-configure | 10 | ||||
-rw-r--r-- | net/rdesktop/pkg-descr | 4 | ||||
-rw-r--r-- | net/rdesktop/pkg-plist | 70 |
6 files changed, 62 insertions, 82 deletions
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index 353d34a383f7..1f3515e7a78a 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -6,30 +6,33 @@ # PORTNAME= rdesktop -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 CATEGORIES= net comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= matt@fruitsalad.org -COMMENT= RDP client for Windows NT Terminal Server +COMMENT= RDP client for Windows NT/2000/2003 Terminal Server USE_XLIB= yes USE_GMAKE= yes USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -CFLAGS+= -DSAVE_LICENSE + +WRKSRC= ${WRKDIR}/rdesktop MAN1= rdesktop.1 +DOCS= doc/AUTHORS doc/TODO doc/*.txt do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${PREFIX}/man/man1 - @${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop - @${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop/keymaps - @for f in ${WRKSRC}/keymaps/*; do \ - ${INSTALL_DATA} $$f ${PREFIX}/share/rdesktop/keymaps; \ - done + ${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1 + @${MKDIR} ${DATADIR}/keymaps + ${INSTALL_DATA} ${WRKSRC}/keymaps/* ${DATADIR}/keymaps +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo index 5769f7e1c3c5..403e86e3392c 100644 --- a/net/rdesktop/distinfo +++ b/net/rdesktop/distinfo @@ -1 +1 @@ -MD5 (rdesktop-1.2.0.tar.gz) = b5e108e83e9de883e965a2bb0c7e7036 +MD5 (rdesktop-1.3.0.tar.gz) = d8108781d227221a823c34b861486a5d diff --git a/net/rdesktop/files/patch-Makefile b/net/rdesktop/files/patch-Makefile deleted file mode 100644 index bb73c79c6e42..000000000000 --- a/net/rdesktop/files/patch-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig Thu Jan 30 21:54:23 2003 -+++ Makefile Fri Jan 31 18:22:58 2003 -@@ -20,6 +20,8 @@ - include Makeconf # configure-generated - - -+all: rdesktop -+ - rdesktop: $(RDPOBJ) $(CRYPTOBJ) - $(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) - -@@ -29,23 +31,10 @@ - install: installbin installkeymaps installman - - installbin: rdesktop -- mkdir -p $(DESTDIR)/$(bindir) -- install rdesktop $(DESTDIR)/$(bindir) -- strip $(DESTDIR)/$(bindir)/rdesktop -- chmod 755 $(DESTDIR)/$(bindir)/rdesktop - - installman: doc/rdesktop.1 -- mkdir -p $(DESTDIR)/$(mandir)/man1 -- cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1 -- chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1 - - installkeymaps: -- mkdir -p $(DESTDIR)/$(KEYMAP_PATH) --# Prevent copying the CVS directory -- cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH) -- cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH) -- cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH) -- chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/* - - proto: - cproto -DMAKE_PROTO -o proto.h *.c diff --git a/net/rdesktop/files/patch-configure b/net/rdesktop/files/patch-configure index 6c0685a2866b..1d1463a5df5b 100644 --- a/net/rdesktop/files/patch-configure +++ b/net/rdesktop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Jan 30 21:54:48 2003 -+++ configure Fri Jan 31 18:43:58 2003 -@@ -98,7 +98,7 @@ +--- configure.orig Wed Oct 29 23:49:52 2003 ++++ configure Thu Oct 30 11:04:20 2003 +@@ -115,7 +115,7 @@ echo "CC = $cc" >>Makeconf if $cc -v 2>&1 |grep '^gcc' >/dev/null; then @@ -9,7 +9,7 @@ else cflags="$cflags -O" fi -@@ -220,8 +220,9 @@ +@@ -291,9 +291,9 @@ esac @@ -17,7 +17,7 @@ -echo "LDFLAGS = $ldflags" >>Makeconf +echo "CFLAGS += $cflags" >>Makeconf +echo "LDFLAGS += $ldflags" >>Makeconf -+echo 'DESTDIR = ${prefix}' >>Makeconf + echo "TARGETS = $targets" >>Makeconf echo "configure complete - now run make" diff --git a/net/rdesktop/pkg-descr b/net/rdesktop/pkg-descr index 10f041c42dda..0f53a2308e2a 100644 --- a/net/rdesktop/pkg-descr +++ b/net/rdesktop/pkg-descr @@ -1,6 +1,6 @@ -Rdesktop is an open source client for Windows NT Terminal Server, +Rdesktop is an open source client for Windows NT/2000/2003 Terminal Server, capable of natively speaking its Remote Desktop Protocol (RDP) in -order to present the user's NT desktop. Unlike Citrix ICA, no server +order to present the user's Windows desktop. Unlike Citrix ICA, no server extensions are required. WWW: http://www.rdesktop.org/ diff --git a/net/rdesktop/pkg-plist b/net/rdesktop/pkg-plist index e922a15c9c77..1dcfe310b278 100644 --- a/net/rdesktop/pkg-plist +++ b/net/rdesktop/pkg-plist @@ -1,30 +1,42 @@ +@comment $FreeBSD$ bin/rdesktop -share/rdesktop/keymaps/ar -share/rdesktop/keymaps/fr-be -share/rdesktop/keymaps/en-us -share/rdesktop/keymaps/en-gb -share/rdesktop/keymaps/tr -share/rdesktop/keymaps/th -share/rdesktop/keymaps/sv -share/rdesktop/keymaps/sl -share/rdesktop/keymaps/ru -share/rdesktop/keymaps/pt -share/rdesktop/keymaps/pl -share/rdesktop/keymaps/no -share/rdesktop/keymaps/mk -share/rdesktop/keymaps/lv -share/rdesktop/keymaps/lt -share/rdesktop/keymaps/ja -share/rdesktop/keymaps/it -share/rdesktop/keymaps/hr -share/rdesktop/keymaps/fr -share/rdesktop/keymaps/fi -share/rdesktop/keymaps/es -share/rdesktop/keymaps/de -share/rdesktop/keymaps/da -share/rdesktop/keymaps/pt-br -share/rdesktop/keymaps/common -share/rdesktop/keymaps/convert-map -share/rdesktop/keymaps/modifiers -@unexec rmdir %D/share/rdesktop/keymaps 2>/dev/null || true -@unexec rmdir %D/share/rdesktop 2>/dev/null || true +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/ipv6.txt +%%PORTDOCS%%%%DOCSDIR%%/keymap-names.txt +%%PORTDOCS%%%%DOCSDIR%%/keymapping.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%DATADIR%%/keymaps/pt-br +%%DATADIR%%/keymaps/fr-ch +%%DATADIR%%/keymaps/fr-be +%%DATADIR%%/keymaps/fr-ca +%%DATADIR%%/keymaps/en-us +%%DATADIR%%/keymaps/en-gb +%%DATADIR%%/keymaps/de-ch +%%DATADIR%%/keymaps/tr +%%DATADIR%%/keymaps/th +%%DATADIR%%/keymaps/sv +%%DATADIR%%/keymaps/sl +%%DATADIR%%/keymaps/ru +%%DATADIR%%/keymaps/pt +%%DATADIR%%/keymaps/pl +%%DATADIR%%/keymaps/no +%%DATADIR%%/keymaps/mk +%%DATADIR%%/keymaps/lv +%%DATADIR%%/keymaps/lt +%%DATADIR%%/keymaps/ja +%%DATADIR%%/keymaps/it +%%DATADIR%%/keymaps/hu +%%DATADIR%%/keymaps/hr +%%DATADIR%%/keymaps/fr +%%DATADIR%%/keymaps/fo +%%DATADIR%%/keymaps/fi +%%DATADIR%%/keymaps/es +%%DATADIR%%/keymaps/de +%%DATADIR%%/keymaps/da +%%DATADIR%%/keymaps/ar +%%DATADIR%%/keymaps/common +%%DATADIR%%/keymaps/convert-map +%%DATADIR%%/keymaps/modifiers +@unexec rmdir %D/%%DATADIR%%/keymaps 2>/dev/null || true +@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true |