svn commit: r461768 - in head/devel/pdcurses: . files
Yuri Victorovich
yuri at FreeBSD.org
Wed Feb 14 08:59:16 UTC 2018
Author: yuri
Date: Wed Feb 14 08:59:14 2018
New Revision: 461768
URL: https://svnweb.freebsd.org/changeset/ports/461768
Log:
devel/pdcurses: Update to 3.5
Additional port changes:
* Changed to DISTVERSION
* Added LICENSE=PD (PD is in the project name)
* Added to USE_XORG
* WRKSRC is now needed due to project tree restructuring
* MAKE_ARGS is needed since Makefile doesn't know
some variables, and build is not standard
* Moved patching from post-patch to files/
* Added SONAME to the shared lib
* Fixed some oddness with $(srcdir) in Makefile.in
Reported SONAME and $srcdir problems to the upstream maintainer.
Testing:
* Ran few testcases
* Built 2 depending ports
Reported by: portscout
Approved by: tcberner (mentor, implicit)
Added:
head/devel/pdcurses/files/
head/devel/pdcurses/files/patch-Makefile.in (contents, props changed)
Modified:
head/devel/pdcurses/Makefile
head/devel/pdcurses/distinfo
head/devel/pdcurses/pkg-plist
Modified: head/devel/pdcurses/Makefile
==============================================================================
--- head/devel/pdcurses/Makefile Wed Feb 14 08:43:30 2018 (r461767)
+++ head/devel/pdcurses/Makefile Wed Feb 14 08:59:14 2018 (r461768)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pdcurses
-PORTVERSION= 3.4
+DISTVERSION= 3.5
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= PDCurses-${PORTVERSION}
@@ -10,13 +10,17 @@ DISTNAME= PDCurses-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= Curses library implementation for Win32, DOS, OS/2, and X11
+LICENSE= PD
+
CONFLICTS= pdcurses-the-[0-9]*
USE_LDCONFIG= yes
-USE_XORG= x11 xext sm ice xt xaw
+USE_XORG= x11 xext sm ice xt xaw xmu xpm
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
+WRKSRC= ${WRKDIR}/${DISTNAME}/x11
+
OPTIONS_DEFINE= DEBUG LATIN1 NEXTAW XAW3D
DEBUG_CONFIGURE_ENABLE= debug
@@ -32,11 +36,10 @@ XAW3D_DESC= Link with Xaw3d
XAW3D_CONFIGURE_WITH= xaw3d
XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|$$(libdir)/$$(SHLPRE)$$(SHLFILE)$$(SHLPST)|&.2|' \
- -e '/ln -f -s/ s|libdir)|prefix)/lib|' \
- ${WRKSRC}/Makefile.in
+MAKE_ARGS= libdir=${STAGEDIR}${PREFIX}/lib \
+ bindir=${STAGEDIR}${PREFIX}/bin \
+ includedir=${STAGEDIR}${PREFIX}/include \
+ PDCURSES_SRCDIR=${WRKDIR}/${DISTNAME}
post-install:
@cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libXCurses.so.2 libXCurses.so
Modified: head/devel/pdcurses/distinfo
==============================================================================
--- head/devel/pdcurses/distinfo Wed Feb 14 08:43:30 2018 (r461767)
+++ head/devel/pdcurses/distinfo Wed Feb 14 08:59:14 2018 (r461768)
@@ -1,2 +1,3 @@
-SHA256 (PDCurses-3.4.tar.gz) = 46ad8fd439e71d44819ea884d775ccbf653b9f8b1f7a418a0cce3a510aa2e64b
-SIZE (PDCurses-3.4.tar.gz) = 331253
+TIMESTAMP = 1518595893
+SHA256 (PDCurses-3.5.tar.gz) = 941544c9c813cd96009f7d0f501e800261cd8e7509b9c7e099bab0df3531dcc8
+SIZE (PDCurses-3.5.tar.gz) = 346361
Added: head/devel/pdcurses/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pdcurses/files/patch-Makefile.in Wed Feb 14 08:59:14 2018 (r461768)
@@ -0,0 +1,35 @@
+--- Makefile.in.orig 2018-01-08 17:54:16 UTC
++++ Makefile.in
+@@ -56,17 +56,17 @@ install:
+ $(INSTALL) -d -m 755 $(bindir)
+ $(INSTALL) -d -m 755 $(includedir)
+ $(INSTALL) -d -m 755 $(includedir)/xcurses
+- $(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses.h
+- $(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses/curses.h
++ $(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/curses.h $(includedir)/xcurses.h
++ $(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/curses.h $(includedir)/xcurses/curses.h
+ sed -e 's/#include <curses.h>/#include <xcurses.h>/' \
+- < $(srcdir)/panel.h > ./xpanel.h
++ < $(PDCURSES_SRCDIR)/panel.h > ./xpanel.h
+ $(INSTALL) -m 644 ./xpanel.h $(includedir)/xpanel.h
+- $(INSTALL) -c -m 644 $(srcdir)/panel.h $(includedir)/xcurses/panel.h
+- $(INSTALL) -c -m 644 $(srcdir)/term.h $(includedir)/xcurses/term.h
++ $(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/panel.h $(includedir)/xcurses/panel.h
++ $(INSTALL) -c -m 644 $(PDCURSES_SRCDIR)/term.h $(includedir)/xcurses/term.h
+ $(INSTALL) -c -m 644 $(osdir)/libXCurses.a $(libdir)/libXCurses.a
+ -$(RANLIB) $(libdir)/libXCurses.a
+ -$(INSTALL) -c -m 755 $(osdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) \
+- $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST)
++ $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).2
+ $(INSTALL) -c -m 755 $(osdir)/xcurses-config $(bindir)/xcurses-config
+
+ clean:
+@@ -102,7 +102,7 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+ -$(RANLIB) $@
+
+ $(SHLPRE)$(SHLFILE)$(SHLPST) : $(SHOFILES)
+- $(LD_RXLIB1) -o $@ $(SHOFILES) $(LD_RXLIB2)
++ $(LD_RXLIB1) -soname=$(SHLPRE)$(SHLFILE)$(SHLPST).2 -o $@ $(SHOFILES) $(LD_RXLIB2)
+
+ $(LIBOBJS) $(PDCOBJS) $(SHOFILES) : $(PDCURSES_HEADERS)
+ $(PDCOBJS) $(PDCSHOBJS) : $(PDCURSES_X11_H)
Modified: head/devel/pdcurses/pkg-plist
==============================================================================
--- head/devel/pdcurses/pkg-plist Wed Feb 14 08:43:30 2018 (r461767)
+++ head/devel/pdcurses/pkg-plist Wed Feb 14 08:59:14 2018 (r461768)
@@ -7,5 +7,3 @@ include/xpanel.h
lib/libXCurses.a
lib/libXCurses.so
lib/libXCurses.so.2
-lib/libXpanel.a
-lib/libXpanel.so
More information about the svn-ports-head
mailing list