aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2002-06-25 22:19:45 +0800
committerijliao <ijliao@FreeBSD.org>2002-06-25 22:19:45 +0800
commit4e0ce0b43cd6a1a50f509bc97c627efbc74e4d32 (patch)
tree7b5dd215016f124fd5ade0fa002758f70810cf1f /devel
parent194465abea6bac62ec7973ca59141ccf394fb519 (diff)
downloadfreebsd-ports-gnome-4e0ce0b43cd6a1a50f509bc97c627efbc74e4d32.tar.gz
freebsd-ports-gnome-4e0ce0b43cd6a1a50f509bc97c627efbc74e4d32.tar.zst
freebsd-ports-gnome-4e0ce0b43cd6a1a50f509bc97c627efbc74e4d32.zip
style cleanups
remove *.orig to make PLIST right PR: 39838 Submitted by: maintainer
Diffstat (limited to 'devel')
-rw-r--r--devel/stlport/Makefile3
-rw-r--r--devel/stlport/files/patch-cxxflags9
-rw-r--r--devel/stlport/files/patch-src::common_macros.mak (renamed from devel/stlport/files/patch-common_macros.mak)0
-rw-r--r--devel/stlport/files/patch-src::gcc-freebsd.mak15
-rw-r--r--devel/stlport/files/patch-stlport::config::stl_gcc.h2
5 files changed, 16 insertions, 13 deletions
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index f88222e51793..0e9bb4873f8e 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -34,8 +34,9 @@ INSTALLS_SHLIB= yes
BROKEN= "Not supported on systems prior to FreeBSD 4.4"
.endif
-.if !defined(NOPORTDOCS)
post-install:
+ ${FIND} ${PREFIX}/include/stlport -name \*.orig -delete
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/images
${INSTALL_DATA} ${WRKSRC}/../doc/*.css ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
diff --git a/devel/stlport/files/patch-cxxflags b/devel/stlport/files/patch-cxxflags
deleted file mode 100644
index c14a2abb9419..000000000000
--- a/devel/stlport/files/patch-cxxflags
+++ /dev/null
@@ -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 --git a/devel/stlport/files/patch-common_macros.mak b/devel/stlport/files/patch-src::common_macros.mak
index 33f1f72eb2e7..33f1f72eb2e7 100644
--- a/devel/stlport/files/patch-common_macros.mak
+++ b/devel/stlport/files/patch-src::common_macros.mak
diff --git a/devel/stlport/files/patch-src::gcc-freebsd.mak b/devel/stlport/files/patch-src::gcc-freebsd.mak
index d52bacd145e9..faf6f4d0be3e 100644
--- a/devel/stlport/files/patch-src::gcc-freebsd.mak
+++ b/devel/stlport/files/patch-src::gcc-freebsd.mak
@@ -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 --git a/devel/stlport/files/patch-stlport::config::stl_gcc.h b/devel/stlport/files/patch-stlport::config::stl_gcc.h
index 63edcf9363f9..234f2315262b 100644
--- a/devel/stlport/files/patch-stlport::config::stl_gcc.h
+++ b/devel/stlport/files/patch-stlport::config::stl_gcc.h
@@ -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 @@