Date: Fri, 31 Jan 2003 19:04:40 +1100 (EST) From: Chris Knight <chris@aims.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/47715: [MAINTAINER UPDATE] net/rdesktop: Upgrade to 1.2.0 Message-ID: <200301310804.h0V84ee8035156@ait0fd01.aims.private>
next in thread | raw e-mail | index | archive | help
>Number: 47715 >Category: ports >Synopsis: [MAINTAINER UPDATE] net/rdesktop: Upgrade to 1.2.0 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 31 00:10:14 PST 2003 >Closed-Date: >Last-Modified: >Originator: Chris Knight >Release: FreeBSD 4.7-STABLE i386 >Organization: AIMS Independent Computer Professionals >Environment: System: FreeBSD ait0fd01.aims.private 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan 23 20:54:29 EST 2003 root@ait0fd01.aims.private:/var/obj/usr/src/sys/THINKPAD i386 >Description: Upgrade rdesktop to 1.2.0 >How-To-Repeat: N/A >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/rdesktop/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 6 Jan 2003 19:48:31 -0000 1.15 +++ Makefile 31 Jan 2003 07:42:24 -0000 @@ -6,50 +6,29 @@ # PORTNAME= rdesktop -PORTVERSION= 1.0.0.p19.7.6 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= net comms -MASTER_SITES= http://bibl4.oru.se/projects/rdesktop/dist/releases/ -DISTNAME= rdesktop-1.0.0 - -PATCH_SITES= http://bibl4.oru.se/projects/rdesktop/ \ - http://bibl4.oru.se/projects/rdesktop/patch19/ -PATCHFILES= rdesktop-unified-patch19-7-6.bz2 -PATCH_DIST_STRIP= -p2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= rdesktop-1.2.0 MAINTAINER= chris@aims.com.au -USE_BZIP2= yes - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500023 -LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 -.endif - USE_XLIB= yes USE_GMAKE= yes USE_OPENSSL= yes -USE_REINPLACE= yes -ALL_TARGET= +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} + MAN1= rdesktop.1 -do-patch: - @${EXTRACT_CMD} -dc ${_DISTDIR}/${PATCHFILES} | \ - ${PATCH} ${PATCH_DIST_ARGS} -.if ${OSVERSION} > 500023 - @${REINPLACE_CMD} -e 's:-O2.*-Wall:${CFLAGS} -I${LOCALBASE}/include:g' \ - -e 's:-lgmp:-L${LOCALBASE}/lib -lgmp:g' \ - ${WRKSRC}/Makefile -.else - @${REINPLACE_CMD} -e 's:-O2.*-Wall:${CFLAGS}:g' ${WRKSRC}/Makefile -.endif - @${REINPLACE_CMD} -e 's:/usr/X11R6/:${X11BASE}/:g' \ - -e 's:^PREFIX.*:PREFIX=${PREFIX}:g' \ - -e 's:^install.*:install\: rdesktop:g' \ - -e 's:^.*(INSTALL) rdp-srvr.*::g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's:<endian.h>:<machine/endian.h>:g' \ - ${WRKSRC}/rdesktop.h +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 -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/rdesktop/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 17 Dec 2001 03:43:00 -0000 1.6 +++ distinfo 31 Jan 2003 07:19:35 -0000 @@ -1,2 +1 @@ -MD5 (rdesktop-1.0.0.tar.bz2) = 2f45a57016fe7ee7930848bbcb94f8b7 -MD5 (rdesktop-unified-patch19-7-6.bz2) = c20774a5e6c446f82ec199e8143775ce +MD5 (rdesktop-1.2.0.tar.gz) = b5e108e83e9de883e965a2bb0c7e7036 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/rdesktop/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 5 Jun 2001 02:07:54 -0000 1.1 +++ pkg-plist 31 Jan 2003 07:47:52 -0000 @@ -1 +1,30 @@ 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 Index: files/patch-Makefile =================================================================== RCS file: files/patch-Makefile diff -N files/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile 31 Jan 2003 07:23:32 -0000 @@ -0,0 +1,35 @@ +--- 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 Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 31 Jan 2003 07:44:03 -0000 @@ -0,0 +1,23 @@ +--- configure.orig Thu Jan 30 21:54:48 2003 ++++ configure Fri Jan 31 18:43:58 2003 +@@ -98,7 +98,7 @@ + echo "CC = $cc" >>Makeconf + + if $cc -v 2>&1 |grep '^gcc' >/dev/null; then +- cflags="$cflags -Wall -O2" ++ #cflags="$cflags -Wall -O2" + else + cflags="$cflags -O" + fi +@@ -220,8 +220,9 @@ + esac + + +-echo "CFLAGS = $cflags" >>Makeconf +-echo "LDFLAGS = $ldflags" >>Makeconf ++echo "CFLAGS += $cflags" >>Makeconf ++echo "LDFLAGS += $ldflags" >>Makeconf ++echo 'DESTDIR = ${prefix}' >>Makeconf + + echo "configure complete - now run make" + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301310804.h0V84ee8035156>