diff options
| author | minskim <minskim@pkgsrc.org> | 2005-06-07 14:21:42 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2005-06-07 14:21:42 +0000 |
| commit | 9c4c643d9bcb61811eb2e86f50f9c8636613b995 (patch) | |
| tree | 969e5bd248fa9b25d329c665d09d8822a0874b62 /graphics | |
| parent | 723d67dc4ee1083133a49135318bb45c96b0d308 (diff) | |
| download | pkgsrc-9c4c643d9bcb61811eb2e86f50f9c8636613b995.tar.gz | |
Make the GLU library link against libGL. Bump PKGREVISION of glu.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-af | 9 | ||||
| -rw-r--r-- | graphics/glu/Makefile | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 4108458e134..445964f822d 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2005/06/05 15:39:06 minskim Exp $ +$NetBSD: distinfo,v 1.27 2005/06/07 14:21:42 minskim Exp $ SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189 RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b @@ -11,6 +11,6 @@ SHA1 (patch-ab) = 8de78b793e384578d8821a4ef487bb2b39ebfcb6 SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86 SHA1 (patch-ad) = 000d115933e3f75ca096effa47e8d19c900fe95c SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0 -SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8 +SHA1 (patch-af) = 8f77d0a0e7c63de6bcc44a653767ccd04107c98c SHA1 (patch-ag) = 53723bb74760a43b2ff21f154886b0a6b450058c SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af index e23126ff90a..785c0550954 100644 --- a/graphics/MesaLib/patches/patch-af +++ b/graphics/MesaLib/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2004/10/26 13:55:37 adam Exp $ +$NetBSD: patch-af,v 1.4 2005/06/07 14:21:42 minskim Exp $ ---- src/glu/sgi/Makefile.orig 2004-08-16 07:46:28.000000000 +0000 +--- src/glu/sgi/Makefile.orig 2004-08-16 02:46:28.000000000 -0500 +++ src/glu/sgi/Makefile @@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) ##### RULES ##### @@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.3 2004/10/26 13:55:37 adam Exp $ $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ -@@ -136,10 +138,8 @@ $(LIB_DIR): +@@ -136,10 +138,9 @@ $(LIB_DIR): # Make the library: $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) @@ -23,7 +23,8 @@ $NetBSD: patch-af,v 1.3 2004/10/26 13:55:37 adam Exp $ - -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLU_LIB_DEPS) $(OBJECTS) + ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR} ++ -rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR} \ ++ ${GLU_LIB_DEPS:M-l*} clean: diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index d8ea057d9a1..b5d7c679abc 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/07 14:21:42 minskim Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} +PKGREVISION= 1 COMMENT= GLU polygon tessellation facility for Mesa CONFLICTS+= Mesa-glx-[0-9]* |