summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw44@gmail.com>2014-05-28 19:37:10 +0800
committerTing-Wei Lan <lantw44@gmail.com>2014-05-28 19:38:09 +0800
commitbef1fcdd2c1cd84960f2fe4c49d1ee38a90f8781 (patch)
treed6357131d7e09b86925ddf9875866bac3f4622ab
parente0c002d1ae63d0c3b472b7667f51731e8899f768 (diff)
downloadwspkg-data-bef1fcdd2c1cd84960f2fe4c49d1ee38a90f8781.tar.gz
wspkg-data-bef1fcdd2c1cd84960f2fe4c49d1ee38a90f8781.tar.zst
wspkg-data-bef1fcdd2c1cd84960f2fe4c49d1ee38a90f8781.zip
wsbsd: 更新 patch,移除已經不再需要的 patch
-rw-r--r--wsbsd.files/patches/chinese_oxim.patch4
-rw-r--r--wsbsd.files/patches/devel_py-dbus.patch12
-rw-r--r--wsbsd.files/patches/lang_hugs.patch10
-rw-r--r--wsbsd.files/patches/print_cups-base.patch25
-rw-r--r--wsbsd.files/patches/x11-wm_afterstep-stable.patch40
5 files changed, 8 insertions, 83 deletions
diff --git a/wsbsd.files/patches/chinese_oxim.patch b/wsbsd.files/patches/chinese_oxim.patch
index ad9d855..cb93410 100644
--- a/wsbsd.files/patches/chinese_oxim.patch
+++ b/wsbsd.files/patches/chinese_oxim.patch
@@ -1,8 +1,8 @@
Index: chinese/oxim/Makefile
===================================================================
---- chinese/oxim/Makefile (revision 352385)
+--- chinese/oxim/Makefile (revision 355603)
+++ chinese/oxim/Makefile (working copy)
-@@ -79,5 +79,7 @@
+@@ -80,5 +80,7 @@
post-patch:
${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/src/gtk-immodule/gtkintl.h
diff --git a/wsbsd.files/patches/devel_py-dbus.patch b/wsbsd.files/patches/devel_py-dbus.patch
deleted file mode 100644
index af1050a..0000000
--- a/wsbsd.files/patches/devel_py-dbus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: devel/py-dbus/pkg-plist
-===================================================================
---- devel/py-dbus/pkg-plist (revision 352106)
-+++ devel/py-dbus/pkg-plist (working copy)
-@@ -72,7 +72,6 @@
- %%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
- %%PORTDOCS%%%%DOCSDIR%%/README
- %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html
--%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html
- %%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
- %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
- %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py
diff --git a/wsbsd.files/patches/lang_hugs.patch b/wsbsd.files/patches/lang_hugs.patch
index d7ff105..74ccf65 100644
--- a/wsbsd.files/patches/lang_hugs.patch
+++ b/wsbsd.files/patches/lang_hugs.patch
@@ -1,12 +1,12 @@
Index: lang/hugs/Makefile
===================================================================
---- lang/hugs/Makefile (revision 352106)
+--- lang/hugs/Makefile (revision 355603)
+++ lang/hugs/Makefile (working copy)
-@@ -17,6 +17,7 @@
-
+@@ -18,6 +18,7 @@
#OPTIONS= HUGS_OPENGL "OpenGL/GLUT support" off
HUGS_DATE= Sep2006
+ USES= bison gmake
+USE_GCC= any
- USES= bison
- USE_GMAKE= yes
GNU_CONFIGURE= yes
+ #CONFIGURE_ARGS+= --prefix=${PREFIX} --enable-ffi
+ #CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/wsbsd.files/patches/print_cups-base.patch b/wsbsd.files/patches/print_cups-base.patch
deleted file mode 100644
index 3c74a06..0000000
--- a/wsbsd.files/patches/print_cups-base.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: print/cups-base/Makefile
-===================================================================
---- print/cups-base/Makefile (revision 352424)
-+++ print/cups-base/Makefile (working copy)
-@@ -162,7 +162,6 @@
- --with-dnssd-libs=${LOCALBASE}/lib/
- LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/avahi-libdns
- CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/
--BROKEN= missing function, see http://www.avahi.org/ticket/303
- .else
- CONFIGURE_ARGS+= --disable-dnssd
- PLIST_SUB+= WITH_MDNSRESPONDER="@comment "
-Index: print/cups-base/pkg-plist
-===================================================================
---- print/cups-base/pkg-plist (revision 352424)
-+++ print/cups-base/pkg-plist (working copy)
-@@ -83,8 +83,6 @@
- libexec/cups/backend/snmp
- libexec/cups/backend/socket
- libexec/cups/backend/usb
--%%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd
--%%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns
- libexec/cups/cgi-bin/admin.cgi
- libexec/cups/cgi-bin/classes.cgi
- libexec/cups/cgi-bin/help.cgi
diff --git a/wsbsd.files/patches/x11-wm_afterstep-stable.patch b/wsbsd.files/patches/x11-wm_afterstep-stable.patch
index 4cc6e74..83baf41 100644
--- a/wsbsd.files/patches/x11-wm_afterstep-stable.patch
+++ b/wsbsd.files/patches/x11-wm_afterstep-stable.patch
@@ -1,44 +1,6 @@
-Index: x11-wm/afterstep-stable/files/patch-configure
-===================================================================
---- x11-wm/afterstep-stable/files/patch-configure (revision 352106)
-+++ x11-wm/afterstep-stable/files/patch-configure (working copy)
-@@ -2,6 +2,33 @@
-
- --- configure Sat Jun 24 21:55:24 2006
- +++ configure.orig Sat Jun 24 21:54:41 2006
-+@@ -7955,7 +7955,7 @@
-+ fi
-+
-+ if test "x$enable_staticlibs" = "xyes"; then
-+- AFTERBASE_LIB="../../libAfterBase/libAfterBase.a"
-++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.a /usr/lib/libexecinfo.a"
-+ AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.a"
-+ AFTERSTEP_LIB="../../libAfterStep/libAfterStep.a"
-+ AFTERCONF_LIB="../../libAfterConf/libAfterConf.a"
-+@@ -7974,7 +7974,7 @@
-+ LIBPROG='$(LIB_SHARED_CYG)'
-+ LIBINSTALL="install.cyg"
-+ else
-+- AFTERBASE_LIB="../../libAfterBase/libAfterBase.so"
-++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.so /usr/lib/libexecinfo.a"
-+ AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.so"
-+ AFTERSTEP_LIB="../../libAfterStep/libAfterStep.so"
-+ AFTERCONF_LIB="../../libAfterConf/libAfterConf.so"
-+@@ -7985,7 +7985,7 @@
-+ fi
-+ fi
-+
-+-AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a"
-++AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a /usr/lib/libexecinfo.a"
-+ AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a"
-+ AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a"
-+ AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a"
- @@ -7660,7 +7660,7 @@
-
- fi
Index: x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c
===================================================================
---- x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c (revision 352106)
+--- x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c (revision 355603)
+++ x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c (working copy)
@@ -1,13 +1,11 @@
-$FreeBSD$