diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
| commit | af591191d2b91375c67ab57df64d383e66055294 (patch) | |
| tree | ddbacf3026d39d6b23e622ac51745a4f7db32d44 /misc/openoffice | |
| parent | 675d464c92282081571087f8ad824d1cae9d8414 (diff) | |
| download | pkgsrc-af591191d2b91375c67ab57df64d383e66055294.tar.gz | |
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-ap | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 3168bf3a7db..45bc9affb8b 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2004/06/05 12:22:47 mrauch Exp $ +$NetBSD: distinfo,v 1.24 2004/11/12 06:39:20 jlam Exp $ SHA1 (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e Size (openoffice-1.1.1/OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes @@ -41,7 +41,7 @@ SHA1 (patch-al) = 8da112628aa1760edf26504b24860a12e688bc56 SHA1 (patch-am) = 546afda0b6b5f223b5edf3933f769ab1064a46a2 SHA1 (patch-an) = e030f5ae1dd3ad2bcb5bab21684df2ed8eaf717e SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e -SHA1 (patch-ap) = 827d054cdcc243118a3011ddbed5bcc5bac09c24 +SHA1 (patch-ap) = 8f885c569f09ba3d66481e8d3b60238a50fd38bb SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af diff --git a/misc/openoffice/patches/patch-ap b/misc/openoffice/patches/patch-ap index df0c47621d0..f1223db8a80 100644 --- a/misc/openoffice/patches/patch-ap +++ b/misc/openoffice/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $ +$NetBSD: patch-ap,v 1.4 2004/11/12 06:39:20 jlam Exp $ --- ../stlport/STLport-4.5.patch.orig 2004-04-17 20:08:34.000000000 +0200 +++ ../stlport/STLport-4.5.patch @@ -19,8 +19,8 @@ $NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $ +! # +! # compiler +! # -+! CC+= $(PTHREAD_CFLAGS) -D_REENTRANT -+! CXX+= $(PTHREAD_CFLAGS) -D_REENTRANT ++! CC+= -D_REENTRANT ++! CXX+= -D_REENTRANT +! +! # +! # Basename for libraries @@ -32,7 +32,7 @@ $NetBSD: patch-ap,v 1.3 2004/05/03 20:56:36 mrauch Exp $ +! # +! # +! LINK=ar cr -+! DYN_LINK=$(CXX) $(PTHREAD_LIBS) $(LDFLAGS) -fexceptions -shared -o ++! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o +! +! OBJEXT=o +! DYNEXT=so |