summaryrefslogtreecommitdiff
path: root/x11-themes
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2003-10-03 22:34:44 +0000
committerWill Andrews <will@FreeBSD.org>2003-10-03 22:34:44 +0000
commitd075bf0f8668353d166ce921b27af99b645d652c (patch)
tree345dd3d2608a097c43d147cb2254e11aebc56937 /x11-themes
parentAdd cxmon 3.0, interactive file manipulation tool and disassembler. (diff)
Fix the -pthread problem in case the option gets removed again. This
patch involved patching the core auto* routines in KDE to accept the PTHREAD_* variables in the environment, with fallbacks. We decided the easiest way to implement this in ports was to generate configure instead of risking incorrect generation at port configure time. Said patch has already been committed to HEAD in KDE and as such will be removed with the 3.2 upgrade once it is released. Ports using Makefile.kde that shouldn't be using them (i.e. non-KDE modules) have this support commented out due to lack of patch. Helped out: Adriaan de Groot <adridg@cs.kun.nl> Lauri Watts <lauri@kde.org> Andy Fawcett <andy@athame.co.uk>
Notes
Notes: svn path=/head/; revision=90174
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/kdeartwork3/Makefile3
-rw-r--r--x11-themes/kdeartwork3/distinfo2
-rw-r--r--x11-themes/kdeartwork3/files/patch-configure57
-rw-r--r--x11-themes/kdeartwork4/Makefile3
-rw-r--r--x11-themes/kdeartwork4/distinfo2
-rw-r--r--x11-themes/kdeartwork4/files/patch-configure57
6 files changed, 4 insertions, 120 deletions
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 0948101172af..dceaedfc6872 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -32,9 +32,6 @@ KDE_BUILD_PLIST=yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-pre-configure::
- ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
.if exists(${X11BASE}/bin/xscreensaver)
WITH_XS= yes
.endif # exists(${X11BASE}/bin/xscreensaver)
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index cc86a722a982..5516ac3d8533 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1 +1,3 @@
MD5 (KDE/kdeartwork-3.1.4.tar.bz2) = 042e42ade90a8d137edea88eb7d3e11d
+MD5 (KDE/kdeartwork-2003092201-configure.tar.bz2) = 1b9503ae03b62ba380ff3c5e07b19d2a
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
diff --git a/x11-themes/kdeartwork3/files/patch-configure b/x11-themes/kdeartwork3/files/patch-configure
deleted file mode 100644
index 88893ee6c34a..000000000000
--- a/x11-themes/kdeartwork3/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig Sun May 11 14:21:07 2003
-+++ configure Sun May 11 14:22:34 2003
-@@ -24849,12 +24849,12 @@
- IFS=$old_IFS
-
-
-- echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
--echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
-+echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
- if test -n "$XSCREENSAVER"; then
- kde_cv_path="$XSCREENSAVER";
- else
-- kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+ kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
-
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24870,16 +24870,16 @@
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
-- if test -x "$dir/lib/xscreensaver/flame"; then
-+ if test -x "$dir/bin/xscreensaver-hacks/flame"; then
- if test -n ""
- then
-- evalstr="$dir/lib/xscreensaver/flame 2>&1 "
-+ evalstr="$dir/bin/xscreensaver-hacks/flame 2>&1 "
- if eval $evalstr; then
-- kde_cv_path="$dir/lib/xscreensaver/flame"
-+ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
- break
- fi
- else
-- kde_cv_path="$dir/lib/xscreensaver/flame"
-+ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
- break
- fi
- fi
-@@ -24923,7 +24923,7 @@
- XSCREENSAVER_CONFIG=NO
- for i in $xscreensaver_prefixes ;
- do
-- for j in lib/xscreensaver/config/flame.xml;
-+ for j in share/xscreensaver/config/flame.xml;
- do
- echo "configure: 24928: $i/$j" >&5
- if test -r "$i/$j"; then
-@@ -24954,7 +24954,7 @@
- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
- fi
- else
-- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-+ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
- fi
- echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
- echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 0948101172af..dceaedfc6872 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -32,9 +32,6 @@ KDE_BUILD_PLIST=yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-pre-configure::
- ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
-
.if exists(${X11BASE}/bin/xscreensaver)
WITH_XS= yes
.endif # exists(${X11BASE}/bin/xscreensaver)
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index cc86a722a982..5516ac3d8533 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1 +1,3 @@
MD5 (KDE/kdeartwork-3.1.4.tar.bz2) = 042e42ade90a8d137edea88eb7d3e11d
+MD5 (KDE/kdeartwork-2003092201-configure.tar.bz2) = 1b9503ae03b62ba380ff3c5e07b19d2a
+MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
diff --git a/x11-themes/kdeartwork4/files/patch-configure b/x11-themes/kdeartwork4/files/patch-configure
deleted file mode 100644
index 88893ee6c34a..000000000000
--- a/x11-themes/kdeartwork4/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig Sun May 11 14:21:07 2003
-+++ configure Sun May 11 14:22:34 2003
-@@ -24849,12 +24849,12 @@
- IFS=$old_IFS
-
-
-- echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
--echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
-+echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
- if test -n "$XSCREENSAVER"; then
- kde_cv_path="$XSCREENSAVER";
- else
-- kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
-+ kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
-
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -24870,16 +24870,16 @@
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
-- if test -x "$dir/lib/xscreensaver/flame"; then
-+ if test -x "$dir/bin/xscreensaver-hacks/flame"; then
- if test -n ""
- then
-- evalstr="$dir/lib/xscreensaver/flame 2>&1 "
-+ evalstr="$dir/bin/xscreensaver-hacks/flame 2>&1 "
- if eval $evalstr; then
-- kde_cv_path="$dir/lib/xscreensaver/flame"
-+ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
- break
- fi
- else
-- kde_cv_path="$dir/lib/xscreensaver/flame"
-+ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
- break
- fi
- fi
-@@ -24923,7 +24923,7 @@
- XSCREENSAVER_CONFIG=NO
- for i in $xscreensaver_prefixes ;
- do
-- for j in lib/xscreensaver/config/flame.xml;
-+ for j in share/xscreensaver/config/flame.xml;
- do
- echo "configure: 24928: $i/$j" >&5
- if test -r "$i/$j"; then
-@@ -24954,7 +24954,7 @@
- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
- fi
- else
-- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
-+ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
- fi
- echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
- echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 13:12:06 +0000