On Mon, May 28, 2007 at 04:48:25PM -0300, Diego Casati wrote:
> Follows an update to sysutils/xps
> 
> Works for me on i386.
> 
> 
> 
> Tests and comments please.

- wantlib is wrong
- do-install target is wrong too
- and you aren't running -current

here's a new diff:

ok?

 
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/xps/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile    20 Dec 2004 10:35:36 -0000      1.8
+++ Makefile    28 May 2007 20:20:03 -0000
@@ -1,15 +1,15 @@
 # $OpenBSD: Makefile,v 1.8 2004/12/20 10:35:36 alek Exp $
 
-DISTNAME=       xps-3.21
+DISTNAME=       xps-4.2
 CATEGORIES=     sysutils x11
 
-MASTER_SITES=   ftp://netwinder.org/users/r/rocky/
+MASTER_SITES=  http://internap.dl.sourceforge.net/sourceforge/motif-pstree/
 
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=               ICE SM X11 Xext Xmu Xt c kvm util 
+WANTLIB=               ICE SM X11 Xext Xmu Xt c kvm
 
 COMMENT=       "graphically display and update dynamically the process tree"
 
@@ -27,9 +27,9 @@
 NO_REGRESS=            Yes
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKBUILD}/xps ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKBUILD}/docs/xps.man ${PREFIX}/man/man1/xps.1
-       ${INSTALL_DATA} ${WRKBUILD}/Xps \
+       ${INSTALL_PROGRAM} ${WRKBUILD}/src/xps ${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKBUILD}/doc/xps.1 ${PREFIX}/man/man1/xps.1
+       ${INSTALL_DATA} ${WRKBUILD}/src/Xps \
                ${PREFIX}/lib/X11/app-defaults
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/xps/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    5 Apr 2007 17:26:13 -0000       1.3
+++ distinfo    28 May 2007 20:20:03 -0000
@@ -1,5 +1,5 @@
-MD5 (xps-3.21.tar.gz) = OvcCKHpPHIi2+wkMuDlqJA==
-RMD160 (xps-3.21.tar.gz) = 8ceL6fVVzaRNEDb2wD1UZ9lh4Bg=
-SHA1 (xps-3.21.tar.gz) = 9EZ1NKvUry0+IzLrPDxiNP5dbeA=
-SHA256 (xps-3.21.tar.gz) = 7sL0DTlEhn3JmSyJyILBQj4yxzst5glxD+bisJZZyEA=
-SIZE (xps-3.21.tar.gz) = 182090
+MD5 (xps-4.2.tar.gz) = VWbFxd0Jysh5yE3s6yfIoQ==
+RMD160 (xps-4.2.tar.gz) = wgWUUm84cMBJ4u4YVTNIfFG8Gu0=
+SHA1 (xps-4.2.tar.gz) = VckXYIbgGaWNYyWAox1wYYI14Uk=
+SHA256 (xps-4.2.tar.gz) = Pkftbj6UtO8O07QZ5LgNEG5nVMLpkm3ze1oG4oy6S38=
+SIZE (xps-4.2.tar.gz) = 279690


> Diego Casati
> 
> 
> Index: Makefile
> ===================================================================
> retrieving revision 3.21
> diff -u  /usr/ports/sysutils/xps/Makefile   /usr/ports/mystuff/xps/Makefile
> --- /usr/ports/sysutils/xps/Makefile    Mon May 28 15:51:00 2007
> +++ /usr/ports/mystuff/xps/Makefile     Mon May 28 15:12:24 2007
> @@ -1,35 +1,35 @@
> # $OpenBSD: Makefile,v 1.8 2004/12/20 10:35:36 alek Exp $
> 
> -DISTNAME=       xps-3.21
> +DISTNAME=       xps-4.2
> CATEGORIES=     sysutils x11
> 
> -MASTER_SITES=   ftp://netwinder.org/users/r/rocky/
> +MASTER_SITES=
> http://internap.dl.sourceforge.net/sourceforge/motif-pstree/
> 
> PERMIT_PACKAGE_CDROM=   Yes
> PERMIT_PACKAGE_FTP=     Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP=   Yes
> -WANTLIB=                ICE SM X11 Xext Xmu Xt c kvm util
> +WANTLIB=               ICE SM X11 Xext Xmu Xt c kvm util
> 
> -COMMENT=        "graphically display and update dynamically the process
> tree"
> +COMMENT=       "graphically display and update dynamically the process
> tree"
> 
> HOMEPAGE=       http://www.netwinder.org/~rocky/xps-home/
> 
> -USE_GMAKE=              Yes
> +USE_GMAKE=             Yes
> 
> -CONFIGURE_STYLE=        gnu
> -CONFIGURE_ARGS=         --x-includes=${LOCALBASE}/include \
> -                        --with-motif-libs=${LOCALBASE}/lib
> +CONFIGURE_STYLE=       gnu
> +CONFIGURE_ARGS=                --x-includes=${LOCALBASE}/include \
> +                       --with-motif-libs=${LOCALBASE}/lib
> 
> -USE_X11=                Yes
> -USE_MOTIF=              any
> +USE_X11=               Yes
> +USE_MOTIF=             any
> 
> -NO_REGRESS=             Yes
> +NO_REGRESS=            Yes
> 
> do-install:
> -        ${INSTALL_PROGRAM} ${WRKBUILD}/xps ${PREFIX}/bin
> -        ${INSTALL_MAN} ${WRKBUILD}/docs/xps.man ${PREFIX}/man/man1/xps.1
> -        ${INSTALL_DATA} ${WRKBUILD}/Xps \
> -                ${PREFIX}/lib/X11/app-defaults
> +       ${INSTALL_PROGRAM} ${WRKBUILD}/xps ${PREFIX}/bin
> +       ${INSTALL_MAN} ${WRKBUILD}/docs/xps.man ${PREFIX}/man/man1/xps.1
> +       ${INSTALL_DATA} ${WRKBUILD}/Xps \
> +               ${PREFIX}/lib/X11/app-defaults
> 
> .include <bsd.port.mk>
> 
> 
> 
> Index: distinfo
> ===================================================================
> retrieving revision 3.21
> diff -u  /usr/ports/sysutils/xps/distinfo    /usr/ports/mystuff/xps/distinfo
> --- /usr/ports/sysutils/xps/distinfo    Mon May 28 15:51:28 2007
> +++ /usr/ports/mystuff/xps/distinfo     Mon May 28 15:12:24 2007
> @@ -1,5 +1,4 @@
> -MD5 (xps-3.21.tar.gz) = OvcCKHpPHIi2+wkMuDlqJA== -RMD160 (xps-3.21.tar.gz)
> = 8ceL6fVVzaRNEDb2wD1UZ9lh4Bg=
> -SHA1 (xps-3.21.tar.gz) = 9EZ1NKvUry0+IzLrPDxiNP5dbeA=
> -SHA256 (xps-3.21.tar.gz) = 7sL0DTlEhn3JmSyJyILBQj4yxzst5glxD+bisJZZyEA=
> -SIZE (xps-3.21.tar.gz) = 182090
> +MD5 (xps-4.2.tar.gz) = 5566c5c5dd09cac879c84deceb27c8a1 RMD160
> +(xps-4.2.tar.gz) = c20594526f3870c049e2ee185533487c51bc1aed
> +SHA1 (xps-4.2.tar.gz) = 55c9176086e019a58d632580a31d70618235e149
> +SIZE (xps-4.2.tar.gz) =  279690

Reply via email to