aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorperky <perky@FreeBSD.org>2002-10-13 14:17:07 +0800
committerperky <perky@FreeBSD.org>2002-10-13 14:17:07 +0800
commit5ccd98b386625307d21e3cbe1decbe34793da34b (patch)
treeb3d01d5fbda222cff6a7718e1046db67e29acf69 /devel
parent20c2d9f718bbecee85f46733783e75e2564ec9f2 (diff)
downloadfreebsd-ports-gnome-5ccd98b386625307d21e3cbe1decbe34793da34b.tar.gz
freebsd-ports-gnome-5ccd98b386625307d21e3cbe1decbe34793da34b.tar.zst
freebsd-ports-gnome-5ccd98b386625307d21e3cbe1decbe34793da34b.zip
Update to 0.51.0
Diffstat (limited to 'devel')
-rw-r--r--devel/newt/Makefile34
-rw-r--r--devel/newt/distinfo3
-rw-r--r--devel/newt/files/patch-ab31
-rw-r--r--devel/newt/pkg-plist2
4 files changed, 48 insertions, 22 deletions
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 8f332f94c660..001e3bda0cb9 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -6,26 +6,27 @@
#
PORTNAME= newt
-PORTVERSION= 0.50.39
+PORTVERSION= 0.51.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL} \
# ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/
MASTER_SITE_SUBDIR= perky
-PKGNAMESUFFIX= ${PYTHONSUFFIX}${TCLSUFFIX}
+PKGNAMESUFFIX= ${PYTHONSUFFIX}${TCLSUFFIX}${I18NSUFFIX}
MAINTAINER= perky@FreeBSD.org
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
popt.0:${PORTSDIR}/devel/popt
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-VERSION= 50
+SOVERSION= 51
TCL_VERSION?= tcl8.3
TCL_NODOT= ${TCL_VERSION:S/.//}
-MAKE_ENV+= VERSION=${VERSION} CC=${CC} PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
-PLIST_SUB+= VERSION=${VERSION} EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
-CPIO?= /usr/bin/cpio
+MAKE_ENV+= CC=${CC} PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
+PLIST_SUB+= SOVERSION=${SOVERSION} \
+ EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
.if !defined(WITHOUT_PYTHON)
PYTHONSUFFIX= -${PYTHON_PKGNAMEPREFIX:S/-//}
@@ -46,15 +47,32 @@ PLIST_SUB+= TCLOPT=""
PLIST_SUB+= TCLOPT="@comment "
.endif
+_HAVE_WCHAR_LIB!= grep wcwidth ${DESTDIR}/usr/lib/libc.so 2>/dev/null \
+ || true
+.if empty(_HAVE_WCHAR_LIB)
+PATCH_SITES= ${MASTER_SITE_LOCAL} \
+ http://people.freebsd.org/~perky/distfiles/
+PATCH_SITE_SUBDIR= perky
+PATCHFILES= newt-${PORTVERSION}-dei18n.diff.gz
+PATCH_DIST_STRIP= -p1
+I18NSUFFIX= -noi18n
+.endif
+
+post-patch:
+ ${REINPLACE_CMD} -e 's,^\(SONAME=\).*,\1${SOVERSION},g' \
+ ${WRKSRC}/configure
+
.if !defined(WITHOUT_PYTHON)
post-build:
@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py build
post-install:
- @cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py install --prefix=${PREFIX}
+ @cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py \
+ install --prefix=${PREFIX}
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py ${EXAMPLESDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py \
+ ${EXAMPLESDIR}
.endif
.endif
diff --git a/devel/newt/distinfo b/devel/newt/distinfo
index bd7398ae7b70..1c0dfac9b06b 100644
--- a/devel/newt/distinfo
+++ b/devel/newt/distinfo
@@ -1 +1,2 @@
-MD5 (newt-0.50.39.tar.gz) = d21566d8b226ff25906f8ec00833455a
+MD5 (newt-0.51.0.tar.gz) = 33e9bbf29126dfdc0bd4b6bd1509b62d
+MD5 (newt-0.51.0-dei18n.diff.gz) = be97e7220064696c67f3b4c4a581161d
diff --git a/devel/newt/files/patch-ab b/devel/newt/files/patch-ab
index 9851e183d799..12f52f180138 100644
--- a/devel/newt/files/patch-ab
+++ b/devel/newt/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Mar 19 02:31:59 2002
-+++ Makefile.in Sun May 5 01:17:55 2002
-@@ -1,23 +1,25 @@
+--- Makefile.in.orig Fri Aug 16 05:18:11 2002
++++ Makefile.in Sun Oct 13 15:04:07 2002
+@@ -1,28 +1,31 @@
-LIBS = -lslang -lm #-lefence
-SHLIBS = -lslang -lm -lc
+LIBS = -lslang -lm -lpopt -lncurses #-lefence
@@ -8,18 +8,19 @@
GPM_SUPPORT=@gpm_support@
--CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang
+-CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang -D_GNU_SOURCE
-ifeq ($(RPM_OPT_FLAGS),)
--CFLAGS += -g # -O2 -I/usr/include/slang
+-CFLAGS += -g
-endif
+CFLAGS += -I${LOCALBASE}/include -I${PREFIX}/include
+LDFLAGS += -L${LOCALBASE}/lib -L${PREFIX}/lib
--VERSION = @VERSION@
+ VERSION = @VERSION@
CVSTAG = r$(subst .,-,$(VERSION))
SONAME = @SONAME@
- PYTHONVERS = $(shell ls -d /usr/include/python* | sed "s|/usr/include/||g")
+-PYTHONVERS = $(shell ls -d /usr/include/python* | sed "s|/usr/include/||g")
++#PYTHONVERS = $(shell ls -d /usr/include/python* | sed "s|/usr/include/||g")
-WHIPTCLSO=
-#WHIPTCLSO=whiptcl.so
@@ -36,7 +37,13 @@
TESTOBJS = test.o
NDIALOGOBJS = whiptail.o dialogboxes.o
WHIPTCLOBJS = whiptcl.o dialogboxes.o
-@@ -30,7 +32,7 @@
+ LIBNEWT = libnewt.a
+-LIBNEWTSH = libnewt.so.$(VERSION)
++LIBNEWTSH = libnewt.so.$(SONAME)
+ LIBNEWTSONAME = libnewt.so.$(SONAME)
+ LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
+ scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
+@@ -30,7 +33,7 @@
SHCFLAGS = -fPIC
@@ -45,7 +52,7 @@
includedir = $(prefix)/include
libdir = $(prefix)/lib
bindir = $(prefix)/bin
-@@ -41,41 +43,37 @@
+@@ -41,41 +44,37 @@
SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
SHAREDDIR = shared
@@ -99,7 +106,7 @@
newt.o: newt.c Makefile
$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-@@ -96,7 +94,7 @@
+@@ -96,7 +95,7 @@
sharedlib: $(LIBNEWTSH)
$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
@@ -108,7 +115,7 @@
$(SHAREDDIR)/%.o : %.c
$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-@@ -113,16 +111,11 @@
+@@ -113,16 +112,11 @@
install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
install -s -m 755 whiptail $(instroot)/$(bindir)
@@ -126,7 +133,7 @@
configure: configure.in
autoconf
-@@ -140,7 +133,3 @@
+@@ -140,7 +134,3 @@
@rm -f /tmp/newt-$(VERSION).tar.gz
@echo " "
@echo "The final archive is ./newt-$(VERSION).tar.gz."
diff --git a/devel/newt/pkg-plist b/devel/newt/pkg-plist
index d9e609ef2102..948024ca63ff 100644
--- a/devel/newt/pkg-plist
+++ b/devel/newt/pkg-plist
@@ -5,7 +5,7 @@ bin/whiptail
%%TCLOPT%%lib/whiptcl.so
lib/libnewt.a
lib/libnewt.so
-lib/libnewt.so.%%VERSION%%
+lib/libnewt.so.%%SOVERSION%%
include/newt.h
%%PORTDOCS%%%%PYTHONOPT%%%%EXAMPLESDIR%%/peanuts.py
%%PORTDOCS%%%%PYTHONOPT%%%%EXAMPLESDIR%%/popcorn.py