cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix build failure caused by the addition of getpwnam_r(3)

Browse Source 
- add @bin markers to pkg lists
okay robert@
This commit is contained in:
kurt 2008-06-27 13:11:11 +00:00
parent 035adaf973
commit 845be6e626
4 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2008/06/24 02:46:21 kurt Exp $
# $OpenBSD: Makefile,v 1.78 2008/06/27 13:11:11 kurt Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -10,9 +10,9 @@ VERSION= 2.4.1
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOH680_m17
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}p0
PKGNAME-main= openoffice-${VERSION}p0
PKGNAME-kde= openoffice-kde-${VERSION}p0
PKGNAME-java= openoffice-java-${VERSION}p1
CATEGORIES= editors productivity
SHARED_LIBS= stlport_gcc 4.5

21
editors/openoffice/patches/patch-sal_osl_unx_system_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-sal_osl_unx_system_c,v 1.3 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/system.c.orig.port Fri Jan 19 06:43:54 2007
+++ sal/osl/unx/system.c Wed Apr 18 03:46:26 2007
@@ -48,7 +48,7 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
/* struct passwd differs on some platforms */
-#if defined NETBSD || defined MACOSX
+#if defined NETBSD || defined MACOSX || defined OPENBSD
#include <pwd.h>
#include <sys/types.h>
@@ -139,7 +139,7 @@ struct passwd *getpwnam_r(const char* name, struct pas
#endif /* MACOSX */
}
-#if defined(NETBSD) || defined(MACOSX)
+#if defined(NETBSD) || defined(MACOSX) || defined (OPENBSD)
int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
size_t buflen, struct passwd **result)
{

4
editors/openoffice/pkg/PLIST-java
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-java,v 1.4 2007/11/13 09:46:28 robert Exp $
@comment $OpenBSD: PLIST-java,v 1.5 2008/06/27 13:11:11 kurt Exp $
%%SHARED%%
openoffice/program/JREProperties.class
openoffice/program/classes/
@ -42,7 +42,7 @@ openoffice/program/classes/xalan.jar
openoffice/program/classes/xercesImpl.jar
openoffice/program/classes/xmerge.jar
openoffice/program/classes/xml-apis.jar
openoffice/program/javaldx
@bin openoffice/program/javaldx
openoffice/share/Scripts/java/
openoffice/share/Scripts/java/HelloWorld/
openoffice/share/Scripts/java/HelloWorld/HelloWorld.jar

29
editors/openoffice/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.13 2008/05/21 06:36:58 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.14 2008/06/27 13:11:11 kurt Exp $
@pkgpath editors/openoffice
%%SHARED%%
bin/sbase
@ -204,12 +204,12 @@ openoffice/program/bootstrap.uno.so
openoffice/program/bootstraprc
openoffice/program/cde-open-url
openoffice/program/configimport
openoffice/program/configimport.bin
@bin openoffice/program/configimport.bin
openoffice/program/configmgrrc
openoffice/program/gengal
openoffice/program/gengal.bin
@bin openoffice/program/gengal.bin
openoffice/program/gnome-open-url
openoffice/program/gnome-open-url.bin
@bin openoffice/program/gnome-open-url.bin
openoffice/program/hid.lst
openoffice/program/intro.bmp
openoffice/program/jvmfwk3rc
@ -232,17 +232,17 @@ openoffice/program/libuno_purpenvhelpergcc3.so.3
openoffice/program/libuno_sal.so.3
openoffice/program/libuno_salhelpergcc3.so.3
openoffice/program/mailmerge.py
openoffice/program/msfontextract
@bin openoffice/program/msfontextract
openoffice/program/officehelper.py
openoffice/program/open-url
openoffice/program/pagein
@bin openoffice/program/pagein
openoffice/program/pagein-calc
openoffice/program/pagein-common
openoffice/program/pagein-draw
openoffice/program/pagein-impress
openoffice/program/pagein-writer
openoffice/program/pkgchk
openoffice/program/pkgchk.bin
@bin openoffice/program/pkgchk.bin
openoffice/program/pythonloader.py
openoffice/program/pythonloader.unorc
openoffice/program/pythonscript.py
@ -323,28 +323,28 @@ openoffice/program/sdraw
openoffice/program/senddoc
openoffice/program/services.rdb
openoffice/program/setofficelang
openoffice/program/setofficelang.bin
@bin openoffice/program/setofficelang.bin
openoffice/program/setuprc
openoffice/program/simpress
openoffice/program/smath
openoffice/program/soffice
openoffice/program/soffice.bin
@bin openoffice/program/soffice.bin
openoffice/program/sofficerc
openoffice/program/spadmin
openoffice/program/spadmin.bin
@bin openoffice/program/spadmin.bin
openoffice/program/stocservices.uno.so
openoffice/program/swriter
openoffice/program/testtool.bin
@bin openoffice/program/testtool.bin
openoffice/program/testtoolrc
openoffice/program/types.rdb
openoffice/program/uno
openoffice/program/uno.bin
@bin openoffice/program/uno.bin
openoffice/program/uno.py
openoffice/program/unohelper.py
openoffice/program/unopkg
openoffice/program/unopkg.bin
@bin openoffice/program/unopkg.bin
openoffice/program/unorc
openoffice/program/uri-encode
@bin openoffice/program/uri-encode
openoffice/program/vbaapi.oxt
openoffice/program/versionrc
openoffice/program/viewdoc
@ -2975,7 +2975,6 @@ share/applications/openoffice/draw.desktop
share/applications/openoffice/impress.desktop
share/applications/openoffice/math.desktop
share/applications/openoffice/writer.desktop
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/ooo-base.png
share/icons/hicolor/48x48/apps/ooo-calc.png
share/icons/hicolor/48x48/apps/ooo-draw.png