Date: Tue, 25 Jun 2002 05:31:57 -0700 (PDT) From: Paul Marquis <pmarquis@pobox.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39838: Maintainer update port: devel/stlport Message-ID: <200206251231.g5PCVvW8025379@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 39838
>Category: ports
>Synopsis: Maintainer update port: devel/stlport
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 25 05:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Paul Marquis
>Release: 4-STABLE
>Organization:
>Environment:
FreeBSD sboy.pmarquis.com 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 10:04:43 EDT 2002 pmarquis@sboy.pmarquis.com:/usr/obj/home/src/sys/SBOY i386
>Description:
Some style cleanups from various fingers touching this port. Consolidate the patch files and add removal of *.orig in include directory after installation to get pkg-plist right.
Output of diff -Naur attached.
>How-To-Repeat:
>Fix:
diff -Naur stlport.orig/Makefile stlport/Makefile
--- stlport.orig/Makefile Fri Jun 7 07:13:21 2002
+++ stlport/Makefile Tue Jun 25 08:04:01 2002
@@ -34,8 +34,9 @@
BROKEN= "Not supported on systems prior to FreeBSD 4.4"
.endif
-.if !defined(NOPORTDOCS)
post-install:
+ ${FIND} ${PREFIX}/include/stlport -name \*.orig -print | ${XARGS} ${RM}
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/images
${INSTALL_DATA} ${WRKSRC}/../doc/*.css ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
diff -Naur stlport.orig/files/patch-common_macros.mak stlport/files/patch-common_macros.mak
--- stlport.orig/files/patch-common_macros.mak Mon Dec 24 17:17:43 2001
+++ stlport/files/patch-common_macros.mak Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- src/common_macros.mak.orig Thu Nov 15 17:08:56 2001
-+++ src/common_macros.mak Mon Dec 24 10:37:02 2001
-@@ -10,7 +10,7 @@
- # We do not assume any binary compatibility for betas.
- BETA_SUFFIX=
-
--VERSION_SUFFIX= .$(VERSION_MAJOR).$(VERSION_MINOR)$(BETA_SUFFIX)
-+VERSION_SUFFIX= _$(VERSION_MAJOR)_$(VERSION_MINOR)$(BETA_SUFFIX)
- WIN_VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
-
- # DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
diff -Naur stlport.orig/files/patch-cxxflags stlport/files/patch-cxxflags
--- stlport.orig/files/patch-cxxflags Sun Mar 10 18:24:14 2002
+++ stlport/files/patch-cxxflags Wed Dec 31 19:00:00 1969
@@ -1,9 +0,0 @@
---- src/gcc-freebsd.mak Tue Nov 27 02:17:56 2001
-+++ src/gcc-freebsd.mak Sun Mar 10 12:59:08 2002
-@@ -43,4 +43,4 @@
-
--CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
--CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-
diff -Naur stlport.orig/files/patch-src::common_macros.mak stlport/files/patch-src::common_macros.mak
--- stlport.orig/files/patch-src::common_macros.mak Wed Dec 31 19:00:00 1969
+++ stlport/files/patch-src::common_macros.mak Mon Dec 24 17:17:43 2001
@@ -0,0 +1,11 @@
+--- src/common_macros.mak.orig Thu Nov 15 17:08:56 2001
++++ src/common_macros.mak Mon Dec 24 10:37:02 2001
+@@ -10,7 +10,7 @@
+ # We do not assume any binary compatibility for betas.
+ BETA_SUFFIX=
+
+-VERSION_SUFFIX= .$(VERSION_MAJOR).$(VERSION_MINOR)$(BETA_SUFFIX)
++VERSION_SUFFIX= _$(VERSION_MAJOR)_$(VERSION_MINOR)$(BETA_SUFFIX)
+ WIN_VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
+
+ # DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
diff -Naur stlport.orig/files/patch-src::gcc-freebsd.mak stlport/files/patch-src::gcc-freebsd.mak
--- stlport.orig/files/patch-src::gcc-freebsd.mak Fri Jun 7 06:37:49 2002
+++ stlport/files/patch-src::gcc-freebsd.mak Tue Jun 25 07:33:27 2002
@@ -1,5 +1,5 @@
---- src/gcc-freebsd.mak.orig Fri Jun 7 10:08:47 2002
-+++ src/gcc-freebsd.mak Fri Jun 7 10:12:33 2002
+--- src/gcc-freebsd.mak.orig Tue Nov 27 02:17:56 2001
++++ src/gcc-freebsd.mak Tue Jun 25 07:30:55 2002
@@ -5,8 +5,8 @@
#
# compiler
@@ -20,3 +20,14 @@
OBJEXT=o
DYNEXT=so
+@@ -41,8 +41,8 @@
+
+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
+
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
diff -Naur stlport.orig/files/patch-stlport::config::stl_gcc.h stlport/files/patch-stlport::config::stl_gcc.h
--- stlport.orig/files/patch-stlport::config::stl_gcc.h Thu Jun 6 17:47:30 2002
+++ stlport/files/patch-stlport::config::stl_gcc.h Tue Jun 25 07:58:59 2002
@@ -1,4 +1,4 @@
---- stlport/config/stl_gcc.h Thu Jan 10 19:41:58 2002
+--- stlport/config/stl_gcc.h.orig Thu Jan 10 19:41:58 2002
+++ stlport/config/stl_gcc.h Thu Jun 6 23:15:40 2002
@@ -250,8 +250,13 @@
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206251231.g5PCVvW8025379>