tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

removing Xp from openmotif



The following patch works for me - should I go ahead and commit it and
revbump all the motif users?

(Background: libXp and the other X printing stuff is both deprecated
and nearly useless; one of the primary reasons we are still carrying
it around is that openmotif required it. This is no longer the case.)


Index: x11/openmotif/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/openmotif/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- x11/openmotif/Makefile      27 Nov 2011 14:17:40 -0000      1.69
+++ x11/openmotif/Makefile      5 Dec 2011 19:58:26 -0000
@@ -2,6 +2,7 @@
 
 PKGVER=                2.3.3
 DISTNAME=      openmotif-${PKGVER}
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  http://ftp.ics.com/openmotif/2.3/2.3.3/
 MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.3/
@@ -51,6 +52,7 @@
 SUBST_SED.man_rename+=         -e 's: Shell.3: XShell.3:g'
 
 CONFIGURE_ARGS+= \
+               --disable-printing \
                --enable-jpeg --enable-png \
                --with-libjpeg-includes=${JPEGBASE}/include \
                --with-libjpeg-lib=${JPEGBASE}/lib \
@@ -113,7 +115,6 @@
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
Index: x11/openmotif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/openmotif/buildlink3.mk,v
retrieving revision 1.18
diff -u -r1.18 buildlink3.mk
--- x11/openmotif/buildlink3.mk 1 Nov 2011 06:03:04 -0000       1.18
+++ x11/openmotif/buildlink3.mk 5 Dec 2011 19:58:26 -0000
@@ -6,7 +6,7 @@
 OPENMOTIF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openmotif+=      openmotif>=2.3.1
-BUILDLINK_ABI_DEPENDS.openmotif?=      openmotif>=2.3.1nb6
+BUILDLINK_ABI_DEPENDS.openmotif?=      openmotif>=2.3.3nb1
 BUILDLINK_PKGSRCDIR.openmotif?=        ../../x11/openmotif
 
 .include "../../mk/jpeg.buildlink3.mk"
@@ -14,7 +14,6 @@
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"


-- 
David A. Holland
dholland%netbsd.org@localhost


Home | Main Index | Thread Index | Old Index