OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 24-Oct-2003 20:26:41 Branch: HEAD Handle: 2003102419263901 Added files: openpkg-src/openmotif openmotif.patch Modified files: openpkg-src/openmotif openmotif.spec openpkg-web news.txt Log: port to FreeBSD Summary: Revision Changes Path 1.1 +80 -0 openpkg-src/openmotif/openmotif.patch 1.2 +4 -1 openpkg-src/openmotif/openmotif.spec 1.7162 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openmotif/openmotif.patch ============================================================================ $ cvs diff -u -r0 -r1.1 openmotif.patch --- /dev/null 2003-10-24 20:26:40.000000000 +0200 +++ openmotif.patch 2003-10-24 20:26:41.000000000 +0200 @@ -0,0 +1,80 @@ +Index: lib/Xm/Xmos.c +--- lib/Xm/Xmos.c.orig 2002-01-30 16:47:25.000000000 +0100 ++++ lib/Xm/Xmos.c 2003-10-24 19:20:16.000000000 +0200 +@@ -230,7 +230,6 @@ + ****************/ + { + int dirSpecLen; +- _Xgetpwparams pwd_buf; + struct passwd * pwd_value; + + char * userDir; +@@ -272,7 +271,7 @@ + } + *destPtr = '\0'; + +- pwd_value = _XGetpwnam(nameBuf, pwd_buf); ++ pwd_value = getpwnam(nameBuf); + if (pwd_value != NULL) + { + userDirLen = strlen(pwd_value->pw_dir); +@@ -1017,7 +1016,6 @@ + XmeGetHomeDirName(void) + { + uid_t uid; +- _Xgetpwparams pwd_buf; + struct passwd * pwd_value; + + char *ptr = NULL; +@@ -1030,11 +1028,11 @@ + if ((ptr = (char *)getenv("HOME")) == NULL) + { + if ((ptr = (char *)getenv(USER_VAR)) != NULL) +- pwd_value = _XGetpwnam(ptr, pwd_buf); ++ pwd_value = getpwnam(ptr); + else + { + uid = getuid(); +- pwd_value = _XGetpwuid(uid, pwd_buf); ++ pwd_value = getpwuid(uid); + } + + if (pwd_value != NULL) +Index: tools/wml/Makefile.in +--- tools/wml/Makefile.in.orig 2002-02-14 15:15:49.000000000 +0100 ++++ tools/wml/Makefile.in 2003-10-24 19:16:26.000000000 +0200 +@@ -121,7 +121,7 @@ + + wmldbcreate_LDADD = ../../lib/Xm/libXm.la + +-INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include ++INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include $(X_CFLAGS) + + noinst_LIBRARIES = libwml.a + libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c +Index: clients/uil/UilDB.c +--- clients/uil/UilDB.c.orig 2002-01-10 21:55:42.000000000 +0100 ++++ clients/uil/UilDB.c 2003-10-24 19:19:36.000000000 +0200 +@@ -894,7 +894,6 @@ + String get_root_dir_name() + { + int uid; +- _Xgetpwparams pwd_buf; + struct passwd *pwd_value; + static char *ptr = NULL; + char *outptr; +@@ -905,12 +904,12 @@ + { + if((ptr = (char *)getenv(USER_VAR)) != NULL) + { +- pwd_value = _XGetpwnam(ptr, pwd_buf); ++ pwd_value = getpwnam(ptr); + } + else + { + uid = getuid(); +- pwd_value = _XGetpwuid(uid, pwd_buf); ++ pwd_value = getpwuid(uid); + } + if (pwd_value != NULL) + { @@ . patch -p0 <<'@@ .' Index: openpkg-src/openmotif/openmotif.spec ============================================================================ $ cvs diff -u -r1.1 -r1.2 openmotif.spec --- openpkg-src/openmotif/openmotif.spec 24 Oct 2003 09:14:09 -0000 1.1 +++ openpkg-src/openmotif/openmotif.spec 24 Oct 2003 18:26:40 -0000 1.2 @@ -41,6 +41,7 @@ # list of sources Source0: ftp://ftp.uk.linux.org/pub/linux/openmotif/%{V_short}/src/openMotif-%{V_long}.tar.gz +Patch0: openmotif.patch # build information Prefix: %{l_prefix} @@ -58,6 +59,7 @@ %prep %setup -q -n openMotif-%{V_long} + %patch -p0 # due to missing animate.c we skip building demos entirely %{l_shtool} subst -s -e 's;^demos/.*$;;' configure.in configure @@ -72,6 +74,7 @@ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ + LIBS="-lc_r" \ ./configure \ --prefix=%{l_prefix} \ --with-x \ @@ -79,7 +82,7 @@ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \ --enable-static \ --disable-shared - %{l_make} %{l_mflags -O} + %{l_make} %{l_mflags} %install rm -rf $RPM_BUILD_ROOT @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.7161 -r1.7162 news.txt --- openpkg-web/news.txt 24 Oct 2003 16:56:09 -0000 1.7161 +++ openpkg-web/news.txt 24 Oct 2003 18:26:39 -0000 1.7162 @@ -1,3 +1,4 @@ +24-Oct-2003: Upgraded package: P<openmotif-2.2.2-20031024> 24-Oct-2003: Upgraded package: P<tacacs-4.4b2-20031024> 24-Oct-2003: Upgraded package: P<gocr-0.37-20031024> 24-Oct-2003: New package: P<gocr-0.37-20031024> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]