mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
Update to version 21.5.11.
Remove GTK support until I figure out why it isn't working.
This commit is contained in:
Gary Jennejohn
parent
c725ada3ec
commit
a75761ccc3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=80010
@ -10,8 +10,8 @@ PORTVERSION= ${XEMACS_VER}
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES= ${MASTER_SITE_XEMACS}
|
||||
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
|
||||
DISTNAME= xemacs-${XEMACS_VER}
|
||||
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
|
||||
DISTNAME= xemacs-${XEMACS_REL}
|
||||
DISTFILES= ${DISTNAME}.11${EXTRACT_SUFX}
|
||||
DIST_SUBDIR= xemacs
|
||||
|
||||
MAINTAINER= gj@FreeBSD.org
|
||||
@ -27,9 +27,11 @@ USE_XLIB= yes
|
||||
USE_XPM= yes
|
||||
.endif
|
||||
|
||||
XEMACS_REL= 21.4
|
||||
XEMACS_VER= 21.4.12
|
||||
XEMACS_REL= 21.5
|
||||
BETA_VER= -b11
|
||||
XEMACS_VER= ${XEMACS_REL}${BETA_VER}
|
||||
XEMACS_ARCH= ${CONFIGURE_TARGET}
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}.11
|
||||
|
||||
STRIP=
|
||||
USE_AUTOCONF_VER=213
|
||||
@ -51,10 +53,10 @@ ALL_TARGET= all dist
|
||||
PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
|
||||
|
||||
pre-fetch:
|
||||
.if !defined(WANT_GTK)
|
||||
@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
|
||||
@${ECHO_MSG} "and recompile."
|
||||
.endif
|
||||
#.if !defined(WANT_GTK)
|
||||
# @${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
|
||||
# @${ECHO_MSG} "and recompile."
|
||||
#.endif
|
||||
.if defined(HAVE_MOTIF)
|
||||
.if !defined(MOTIF_STATIC)
|
||||
@${ECHO_MSG} ""
|
||||
@ -82,12 +84,13 @@ WITH_DIALOGS= --with-dialogs=athena
|
||||
LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
|
||||
.endif
|
||||
|
||||
.if defined(WANT_GTK)
|
||||
WITH_GTK= --with-gtk=yes \
|
||||
--with-xpm=no
|
||||
USE_GNOME= gtk12
|
||||
USE_XPM= no
|
||||
.endif
|
||||
#.if defined(WANT_GTK)
|
||||
#WITH_GTK= --with-gtk=yes \
|
||||
# --with-xpm=no
|
||||
# doesn't work with gtk12?
|
||||
#USE_GNOME= gtk20
|
||||
#USE_XPM= no
|
||||
#.endif
|
||||
|
||||
# Drop faces (libcompface) and offix (libDnd) if building package,
|
||||
# autodetect otherwise
|
||||
@ -105,19 +108,15 @@ pre-configure::
|
||||
.endfor
|
||||
|
||||
post-install::
|
||||
.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
|
||||
.for file in b2m ctags ellcc etags gnuclient ootags xemacs-${XEMACS_REL}-b11
|
||||
strip ${PREFIX}/bin/${file}
|
||||
.endfor
|
||||
# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
|
||||
# Do what PLIST does for pkg_add.
|
||||
${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
|
||||
${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
|
||||
${RM} -f ${PREFIX}/bin/send-pr
|
||||
.if defined(WANT_GTK)
|
||||
@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
|
||||
@${ECHO_MSG} "the maintainer."
|
||||
@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
|
||||
@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
|
||||
.endif
|
||||
#.if defined(WANT_GTK)
|
||||
# @${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
|
||||
# @${ECHO_MSG} "the maintainer."
|
||||
# @${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
|
||||
# @${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
|
||||
#.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1 @@
|
||||
MD5 (xemacs/xemacs-21.4.12-src.tar.gz) = 2e2c1502b1eb76af094108988c626a0e
|
||||
MD5 (xemacs/xemacs-21.4.12-elc.tar.gz) = 6e0931158967f433e46546595bf72904
|
||||
MD5 (xemacs/xemacs-21.4.12-info.tar.gz) = d31805fc1cff0337d40b77422ba86923
|
||||
MD5 (xemacs/xemacs-21.5.11.tar.gz) = f2ad67cd219bb82ab984838c49df0e02
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
--- configure.in.orig Wed Jul 25 09:39:21 2001
|
||||
+++ configure.in Sun Oct 7 23:20:24 2001
|
||||
@@ -1098,6 +1098,7 @@
|
||||
--- configure.in.orig Fri Feb 14 14:31:16 2003
|
||||
+++ configure.in Tue Apr 29 21:52:41 2003
|
||||
@@ -1133,6 +1133,7 @@
|
||||
dnl Straightforward OS determination
|
||||
case "$canonical" in
|
||||
*-*-linux* ) opsys=linux ;;
|
||||
+ *-*-freebsd* ) opsys=freebsd ;;
|
||||
+ *-*-freebsd* ) opsys=freebsd ;;
|
||||
*-*-netbsd* ) opsys=netbsd ;;
|
||||
*-*-openbsd* ) opsys=openbsd ;;
|
||||
*-*-nextstep* ) opsys=nextstep ;;
|
||||
@@ -3661,21 +3662,24 @@
|
||||
@@ -3920,20 +3921,24 @@
|
||||
test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
|
||||
fi
|
||||
dnl Back to our regularly scheduled wnn hunting
|
||||
@ -17,32 +17,32 @@
|
||||
- AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
|
||||
- AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
|
||||
- AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
|
||||
+ if test "$with_wnn6" = "yes"; then
|
||||
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
|
||||
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
|
||||
+ AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
|
||||
+ else
|
||||
+ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
|
||||
+ AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
|
||||
+ AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
|
||||
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
|
||||
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
|
||||
+ fi
|
||||
+ if test "$with_wnn6" = "yes"; then
|
||||
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
|
||||
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
|
||||
+AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
|
||||
+ else
|
||||
+ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
|
||||
+ AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
|
||||
+AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
|
||||
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
|
||||
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
|
||||
+ fi
|
||||
fi
|
||||
test -z "$with_wnn" && with_wnn=yes
|
||||
if test "$with_wnn" = "yes"; then
|
||||
AC_DEFINE(HAVE_WNN)
|
||||
XE_PREPEND(-l$libwnn, libs_x)
|
||||
XE_ADD_OBJS(mule-wnnfns.o)
|
||||
- if test "$with_wnn6" != "no"; then
|
||||
- AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
|
||||
- test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
|
||||
- fi
|
||||
+ dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
|
||||
+ test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
|
||||
fi
|
||||
|
||||
dnl Autodetect canna
|
||||
@@ -4257,7 +4261,7 @@
|
||||
@@ -4526,7 +4531,7 @@
|
||||
dnl Check for Berkeley DB.
|
||||
if test "$with_database_berkdb" != "no"; then
|
||||
AC_MSG_CHECKING(for Berkeley db.h)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- src/lstream.c.orig Sat Jun 29 18:17:20 2002
|
||||
+++ src/lstream.c Sat Jun 29 18:14:06 2002
|
||||
@@ -181,7 +181,7 @@
|
||||
--- src/lstream.c.orig Tue Apr 29 21:31:17 2003
|
||||
+++ src/lstream.c Tue Apr 29 21:31:22 2003
|
||||
@@ -101,7 +101,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-inline static size_t
|
||||
+/*inline*/ static size_t
|
||||
aligned_sizeof_lstream (size_t lstream_type_specific_size)
|
||||
-inline static Bytecount
|
||||
+/*inline*/ static Bytecount
|
||||
aligned_sizeof_lstream (Bytecount lstream_type_specific_size)
|
||||
{
|
||||
return ALIGN_SIZE (offsetof (Lstream, data) + lstream_type_specific_size,
|
||||
return MAX_ALIGN_SIZE (offsetof (Lstream, data) +
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user